diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-08-19 15:07:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 15:07:20 -0500 |
| commit | a378ae61e242f99a1110cd1406bc94cb570375dd (patch) | |
| tree | c839ef4f75d8a3bbffb069e869471a07befee27c /pkgs/stdenv | |
| parent | f7651718b5966be91c4d9a6bbcbd468bd7d17bc8 (diff) | |
| parent | eb970b6241d230213d5e30c92916443a2a0f410f (diff) | |
| download | nixpkgs-a378ae61e242f99a1110cd1406bc94cb570375dd.tar nixpkgs-a378ae61e242f99a1110cd1406bc94cb570375dd.tar.gz nixpkgs-a378ae61e242f99a1110cd1406bc94cb570375dd.tar.bz2 nixpkgs-a378ae61e242f99a1110cd1406bc94cb570375dd.tar.lz nixpkgs-a378ae61e242f99a1110cd1406bc94cb570375dd.tar.xz nixpkgs-a378ae61e242f99a1110cd1406bc94cb570375dd.tar.zst nixpkgs-a378ae61e242f99a1110cd1406bc94cb570375dd.zip | |
Merge pull request #95129 from aaronjanse/aj-fix-llvm-for-redox
mkDerivation: use `Generic` as system name for Redox in cmakeFlags
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 993ae68e9e8..5b1c380548f 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -247,7 +247,8 @@ in rec { (/**/ if lib.isString cmakeFlags then [cmakeFlags] else if cmakeFlags == null then [] else cmakeFlags) - ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" [ stdenv.hostPlatform.uname.system ]}" ] + ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" ( + lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"] ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}" ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" |