colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildDotnetModule: fix cross compilation

Browse Source
This commit is contained in:
Ivar Scholten 2022-05-21 15:33:02 +02:00
parent 051f3f948f
commit 0d8b21b3c8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/dotnet/build-dotnet-module/default.nix
View File

@ -94,9 +94,13 @@ in stdenvNoCC.mkDerivation (args // {
dotnetInstallHook
dotnetFixupHook
dotnet-sdk
cacert
makeWrapper
dotnet-sdk
];
makeWrapperArgs = args.makeWrapperArgs or [ ] ++ [
"--prefix LD_LIBRARY_PATH : ${dotnet-sdk.icu}/lib"
];
# Stripping breaks the executable

2
pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix
View File

@ -53,7 +53,7 @@
dotnetFixupHook = callPackage ({ }:
makeSetupHook {
name = "dotnet-fixup-hook";
deps = [ dotnet-runtime makeWrapper ];
deps = [ dotnet-runtime ];
substitutions = {
dotnetRuntime = dotnet-runtime;
runtimeDeps = lib.makeLibraryPath runtimeDeps;

2
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
View File

@ -1,6 +1,6 @@
declare -a projectFile testProjectFile
# inherit arguments from derivation
# Inherit arguments from derivation
dotnetFlags=( ${dotnetFlags[@]-} )
dotnetRestoreFlags=( ${dotnetRestoreFlags[@]-} )