diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-08-14 10:17:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-14 10:17:12 -0400 |
| commit | 166905cb31005f9a1672f34d662e1a6c6da4c44e (patch) | |
| tree | 3e2b280c55bf53638a8652c9b43244d712287dbd /pkgs/stdenv | |
| parent | 579168b5373357cb1a9b1b7fe067799b9e478817 (diff) | |
| parent | 8cedc7fc6cca524fa3f27d5b70774aad8b4c67ee (diff) | |
| download | nixpkgs-166905cb31005f9a1672f34d662e1a6c6da4c44e.tar nixpkgs-166905cb31005f9a1672f34d662e1a6c6da4c44e.tar.gz nixpkgs-166905cb31005f9a1672f34d662e1a6c6da4c44e.tar.bz2 nixpkgs-166905cb31005f9a1672f34d662e1a6c6da4c44e.tar.lz nixpkgs-166905cb31005f9a1672f34d662e1a6c6da4c44e.tar.xz nixpkgs-166905cb31005f9a1672f34d662e1a6c6da4c44e.tar.zst nixpkgs-166905cb31005f9a1672f34d662e1a6c6da4c44e.zip | |
Merge pull request #65484 from arcnmx/pr-stdenv-cmake-cross
stdenv: correct cross CMAKE_SYSTEM_NAME
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index be79e7626c5..a11b280b047 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -246,7 +246,7 @@ in rec { (/**/ if lib.isString cmakeFlags then [cmakeFlags] else if cmakeFlags == null then [] else cmakeFlags) - ++ lib.optional (stdenv.hostPlatform.uname.system != null) "-DCMAKE_SYSTEM_NAME=${stdenv.hostPlatform.uname.system}" + ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" [ 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}" |