diff options
Diffstat (limited to 'nixpkgs/pkgs/stdenv/generic')
| -rw-r--r-- | nixpkgs/pkgs/stdenv/generic/make-derivation.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/stdenv/generic/setup.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index 7a083660e449..beba687e788a 100644 --- a/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -377,6 +377,8 @@ else let "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" ] ++ lib.optionals (stdenv.buildPlatform.uname.release != null) [ "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}" + ] ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "-DCMAKE_CROSSCOMPILING_EMULATOR=env" ]); mesonFlags = diff --git a/nixpkgs/pkgs/stdenv/generic/setup.sh b/nixpkgs/pkgs/stdenv/generic/setup.sh index 7c948afc4dac..ad9857fc9d61 100644 --- a/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -1216,7 +1216,7 @@ fixLibtool() { done sed -i "$1" \ - -e "s^eval \(sys_lib_search_path=\).*^\1'$search_path'^" \ + -e "s^eval \(sys_lib_search_path=\).*^\1'${search_path:-}'^" \ -e 's^eval sys_lib_.+search_path=.*^^' } |