treewide: don't unnecessary set dotnet-related env vars

These have been moved to a setup hook in dotnet-{sdk,runtime,aspnetcore}
main
Ivar Scholten 2 years ago
parent 8ef298b84f
commit d786405336
  1. 3
      pkgs/build-support/dotnet/build-dotnet-module/default.nix
  2. 2
      pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
  3. 5
      pkgs/development/tools/continuous-integration/github-runner/default.nix
  4. 9
      pkgs/development/tools/misc/netcoredbg/default.nix
  5. 5
      pkgs/servers/jellyfin/default.nix
  6. 4
      pkgs/servers/nosql/eventstore/default.nix

@ -129,9 +129,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

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

@ -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"

@ -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" ];

@ -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"

@ -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

Loading…
Cancel
Save