git.iko.soy/typeable/nixpkgs
on master help sign in
meson: fix cross compilation of systemd

Co-authored-by: Robin Gloster <mail@glob.in>

commit9e1b883144af1fc7c7444c4c18e7b6c24072d9ac authorvolth <volth@webmaster.ms> dateFri 12 Oct 2018, 00:03 (8 years ago) parent8d99a34
1 file changed+10−10
pkgs/development/tools/build-managers/meson/default.nix+10−10
pkgs/development/tools/build-managers/meson/default.nix+10−10
@@ -1,4 +1,4 @@
1−{ lib, python3Packages, stdenv, writeTextDir, substituteAll }:
1+{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
22
33python3Packages.buildPythonApplication rec {
44 version = "0.46.1";
@@ -47,20 +47,20 @@ python3Packages.buildPythonApplication rec {
4747
4848 crossFile = writeTextDir "cross-file.conf" ''
4949 [binaries]
50− c = '${stdenv.cc.targetPrefix}cc'
51− cpp = '${stdenv.cc.targetPrefix}c++'
52− ar = '${stdenv.cc.bintools.targetPrefix}ar'
53− strip = '${stdenv.cc.bintools.targetPrefix}strip'
50+ c = '${targetPackages.stdenv.cc.targetPrefix}cc'
51+ cpp = '${targetPackages.stdenv.cc.targetPrefix}c++'
52+ ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar'
53+ strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip'
5454 pkgconfig = 'pkg-config'
5555
5656 [properties]
5757 needs_exe_wrapper = true
5858
5959 [host_machine]
60− system = '${stdenv.targetPlatform.parsed.kernel.name}'
61− cpu_family = '${stdenv.targetPlatform.parsed.cpu.family}'
62− cpu = '${stdenv.targetPlatform.parsed.cpu.name}'
63− endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
60+ system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}'
61+ cpu_family = '${targetPackages.stdenv.targetPlatform.parsed.cpu.family}'
62+ cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}'
63+ endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
6464 '';
6565
6666 # 0.45 update enabled tests but they are failing
@@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec {
7070
7171 inherit (stdenv) cc;
7272
73− isCross = stdenv.buildPlatform != stdenv.hostPlatform;
73+ isCross = stdenv.targetPlatform != stdenv.hostPlatform;
7474
7575 meta = with lib; {
7676 homepage = http://mesonbuild.com;