diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 4a1cf49440df..393aa155eec5 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -98,7 +98,7 @@ let else dotnet-sdk.meta.platforms; - hook = callPackage ./hook { inherit dotnet-sdk dotnet-runtime; }; + hook = callPackage ./hook { inherit dotnet-runtime; }; inherit (dotnetCorePackages) systemToDotnetRid; in diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix index d3d5b23ea31c..54b802b6a1a0 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix @@ -1,29 +1,15 @@ { lib, - stdenv, which, coreutils, - zlib, - openssl, makeSetupHook, - zip, # Passed from ../default.nix - dotnet-sdk, dotnet-runtime, }: makeSetupHook { name = "dotnet-hook"; substitutions = { - dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker"; - libPath = lib.makeLibraryPath [ - stdenv.cc.cc - stdenv.cc.libc - dotnet-sdk.passthru.icu - zlib - openssl - ]; - inherit zip; - dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null; + dotnetRuntime = dotnet-runtime; wrapperPath = lib.makeBinPath [ which coreutils diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh index 38c07ea7ba10..e7f6f14cb3c1 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh @@ -3,9 +3,6 @@ dotnetConfigurePhase() { runHook preConfigure - local -r dynamicLinker=@dynamicLinker@ - local -r libPath=@libPath@ - if [[ -n $__structuredAttrs ]]; then local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )