Merge pull request #162771 from IvarWithoutBones/dotnet-setuphook

This commit is contained in:
Sandro 2022-03-11 16:25:34 +01:00 committed by GitHub
commit 5416f2ecd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 27 deletions

View file

@ -102,9 +102,6 @@ in stdenvNoCC.mkDerivation (args // {
# gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping
dontWrapGApps = args.dontWrapGApps or true;
DOTNET_NOLOGO = args.DOTNET_NOLOGO or true; # This disables the welcome message.
DOTNET_CLI_TELEMETRY_OPTOUT = args.DOTNET_CLI_TELEMETRY_OPTOUT or true;
passthru = {
fetch-deps = writeScript "fetch-${pname}-deps" ''
set -euo pipefail

View file

@ -9,8 +9,6 @@ dotnetConfigureHook() {
parallelFlag="--disable-parallel"
fi
export HOME=$(mktemp -d)
for project in ${projectFile[@]} ${testProjectFile[@]}; do
env \
dotnet restore "$project" \

View file

@ -4,9 +4,11 @@
}:
assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
{ lib
, stdenv
, fetchurl
, writeText
, libunwind
, openssl
, icu
@ -87,6 +89,13 @@ in stdenv.mkDerivation rec {
$out/bin/dotnet --info
'';
setupHook = writeText "dotnet-setup-hook" ''
export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk
export DOTNET_NOLOGO=1 # Disables the welcome message
export DOTNET_CLI_TELEMETRY_OPTOUT=1
'';
meta = with lib; {
homepage = "https://dotnet.github.io/";
description = builtins.getAttr type descriptions;

View file

@ -102,11 +102,6 @@ stdenv.mkDerivation rec {
configurePhase = ''
runHook preConfigure
# Set up Nuget dependencies
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_NOLOGO=1
# Never use nuget.org
nuget sources Disable -Name "nuget.org"

View file

@ -24,14 +24,7 @@ let
unmanaged = clangStdenv.mkDerivation rec {
inherit src pname version;
nativeBuildInputs = [ cmake ];
# Building the "unmanaged part" still involves compiling C# code.
preBuild = ''
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
'';
nativeBuildInputs = [ cmake dotnet-sdk ];
hardeningDisable = [ "strictoverflow" ];

View file

@ -70,11 +70,6 @@ stdenv.mkDerivation rec {
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_NOLOGO=1
nuget sources Add -Name nixos -Source "$PWD/nixos"
nuget init "$nugetDeps" "$PWD/nixos"

View file

@ -43,10 +43,6 @@ stdenv.mkDerivation rec {
'';
buildPhase = ''
mkdir home
export HOME=$PWD/home
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export FrameworkPathOverride=${mono}/lib/mono/4.7.1-api
# disable default-source so nuget does not try to download from online-repo