diff options
author | David McFarland <corngood@gmail.com> | 2022-10-03 11:51:00 -0300 |
---|---|---|
committer | David McFarland <corngood@gmail.com> | 2022-12-19 15:36:25 -0400 |
commit | 06e4d89943603a309db2d5fe07ff2abf59edc8f5 (patch) | |
tree | 87598c816e13b7b015d4c40e01dfb68e7c4f9248 /pkgs/build-support/dotnet | |
parent | 3fdb6c5a9010690eb4c2676dcc40693094de590d (diff) | |
download | nixpkgs-06e4d89943603a309db2d5fe07ff2abf59edc8f5.tar nixpkgs-06e4d89943603a309db2d5fe07ff2abf59edc8f5.tar.gz nixpkgs-06e4d89943603a309db2d5fe07ff2abf59edc8f5.tar.bz2 nixpkgs-06e4d89943603a309db2d5fe07ff2abf59edc8f5.tar.lz nixpkgs-06e4d89943603a309db2d5fe07ff2abf59edc8f5.tar.xz nixpkgs-06e4d89943603a309db2d5fe07ff2abf59edc8f5.tar.zst nixpkgs-06e4d89943603a309db2d5fe07ff2abf59edc8f5.zip |
build-dotnet-module: strip --runtime flags without using rid
Diffstat (limited to 'pkgs/build-support/dotnet')
-rw-r--r-- | pkgs/build-support/dotnet/build-dotnet-module/default.nix | 5 |
1 files changed, 2 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 237aaad50d2..932ebceceac 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -161,10 +161,9 @@ stdenvNoCC.mkDerivation (args // { # That causes conflicts. To circumvent it we remove all occurances of the flag. flags = let - hasRid = flag: lib.any (v: v) (map (rid: lib.hasInfix rid flag) (lib.attrValues dotnet-sdk.runtimeIdentifierMap)); + isRuntime = flag: lib.hasPrefix "--runtime" flag; in - builtins.filter (flag: !(hasRid flag)) (dotnetFlags ++ dotnetRestoreFlags); - + builtins.filter (flag: !(isRuntime flag)) (dotnetFlags ++ dotnetRestoreFlags); runtimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) platforms; in writeShellScript "fetch-${pname}-deps" '' |