dotnetHook: remove unused substitutions
This commit is contained in:
@@ -98,7 +98,7 @@ let
|
|||||||
else
|
else
|
||||||
dotnet-sdk.meta.platforms;
|
dotnet-sdk.meta.platforms;
|
||||||
|
|
||||||
hook = callPackage ./hook { inherit dotnet-sdk dotnet-runtime; };
|
hook = callPackage ./hook { inherit dotnet-runtime; };
|
||||||
|
|
||||||
inherit (dotnetCorePackages) systemToDotnetRid;
|
inherit (dotnetCorePackages) systemToDotnetRid;
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -1,29 +1,15 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
|
||||||
which,
|
which,
|
||||||
coreutils,
|
coreutils,
|
||||||
zlib,
|
|
||||||
openssl,
|
|
||||||
makeSetupHook,
|
makeSetupHook,
|
||||||
zip,
|
|
||||||
# Passed from ../default.nix
|
# Passed from ../default.nix
|
||||||
dotnet-sdk,
|
|
||||||
dotnet-runtime,
|
dotnet-runtime,
|
||||||
}:
|
}:
|
||||||
makeSetupHook {
|
makeSetupHook {
|
||||||
name = "dotnet-hook";
|
name = "dotnet-hook";
|
||||||
substitutions = {
|
substitutions = {
|
||||||
dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker";
|
dotnetRuntime = dotnet-runtime;
|
||||||
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;
|
|
||||||
wrapperPath = lib.makeBinPath [
|
wrapperPath = lib.makeBinPath [
|
||||||
which
|
which
|
||||||
coreutils
|
coreutils
|
||||||
|
|||||||
@@ -3,9 +3,6 @@ dotnetConfigurePhase() {
|
|||||||
|
|
||||||
runHook preConfigure
|
runHook preConfigure
|
||||||
|
|
||||||
local -r dynamicLinker=@dynamicLinker@
|
|
||||||
local -r libPath=@libPath@
|
|
||||||
|
|
||||||
if [[ -n $__structuredAttrs ]]; then
|
if [[ -n $__structuredAttrs ]]; then
|
||||||
local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
|
local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
|
||||||
local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
|
local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
|
||||||
|
|||||||
Reference in New Issue
Block a user