git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65484 from arcnmx/pr-stdenv-cmake-cross

stdenv: correct cross CMAKE_SYSTEM_NAME

commit166905cb31005f9a1672f34d662e1a6c6da4c44e authorMatthew Bauer <mjbauer95@gmail.com> dateWed 14 Aug 2019, 10:17 (7 years ago) parent579168b8cedc7f
1 file changed+1−1
pkgs/stdenv/generic/make-derivation.nix+1−1
pkgs/stdenv/generic/make-derivation.nix+1−1
@@ -246,7 +246,7 @@ in rec {
246246 (/**/ if lib.isString cmakeFlags then [cmakeFlags]
247247 else if cmakeFlags == null then []
248248 else cmakeFlags)
249− ++ lib.optional (stdenv.hostPlatform.uname.system != null) "-DCMAKE_SYSTEM_NAME=${stdenv.hostPlatform.uname.system}"
249+ ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" [ stdenv.hostPlatform.uname.system ]}" ]
250250 ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
251251 ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}"
252252 ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"