diff options
| author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2022-07-16 12:37:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-16 12:37:11 +0200 |
| commit | e243499338c818d44c4892ce4d9d4e4fad78a195 (patch) | |
| tree | 8dbe85bd49c2b8188cb65966770502a54a344818 /pkgs/build-support/dotnet | |
| parent | dbb17b39ba62667ceb050f9a0a08c607f39aea58 (diff) | |
| parent | 0d8b21b3c840510191c539175be6a60f2a6a6c77 (diff) | |
| download | nixpkgs-e243499338c818d44c4892ce4d9d4e4fad78a195.tar nixpkgs-e243499338c818d44c4892ce4d9d4e4fad78a195.tar.gz nixpkgs-e243499338c818d44c4892ce4d9d4e4fad78a195.tar.bz2 nixpkgs-e243499338c818d44c4892ce4d9d4e4fad78a195.tar.lz nixpkgs-e243499338c818d44c4892ce4d9d4e4fad78a195.tar.xz nixpkgs-e243499338c818d44c4892ce4d9d4e4fad78a195.tar.zst nixpkgs-e243499338c818d44c4892ce4d9d4e4fad78a195.zip | |
Merge pull request #173889 from IvarWithoutBones/fix/dotnet-cross
dotnet ecosystem: fix cross compilation
Diffstat (limited to 'pkgs/build-support/dotnet')
3 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index a689cbcfb68..15fe5a2c5d4 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -96,9 +96,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 diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 5f5916d08b1..1cc88602ff4 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -56,7 +56,7 @@ in dotnetFixupHook = callPackage ({ }: makeSetupHook { name = "dotnet-fixup-hook"; - deps = [ dotnet-runtime makeWrapper ]; + deps = [ dotnet-runtime ]; substitutions = { dotnetRuntime = dotnet-runtime; runtimeDeps = libraryPath; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh index 1686c15d269..3e8c1418950 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -1,6 +1,6 @@ declare -a projectFile testProjectFile -# inherit arguments from derivation +# Inherit arguments from derivation dotnetFlags=( ${dotnetFlags[@]-} ) dotnetRestoreFlags=( ${dotnetRestoreFlags[@]-} ) |