diff options
| author | John Ericson <git@JohnEricson.me> | 2018-11-05 15:09:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-05 15:09:32 -0500 |
| commit | a054d7450768069084142fe597ed2da367813a4a (patch) | |
| tree | be565c6c8a3b878fc253330b7f70470868691e0f /pkgs | |
| parent | 7eaba9af5e4819913ae0ec97c6c6b8ce0143ef4e (diff) | |
| parent | 9e1b883144af1fc7c7444c4c18e7b6c24072d9ac (diff) | |
| download | nixlib-a054d7450768069084142fe597ed2da367813a4a.tar nixlib-a054d7450768069084142fe597ed2da367813a4a.tar.gz nixlib-a054d7450768069084142fe597ed2da367813a4a.tar.bz2 nixlib-a054d7450768069084142fe597ed2da367813a4a.tar.lz nixlib-a054d7450768069084142fe597ed2da367813a4a.tar.xz nixlib-a054d7450768069084142fe597ed2da367813a4a.tar.zst nixlib-a054d7450768069084142fe597ed2da367813a4a.zip | |
Merge pull request #48244 from volth/patch-257
meson: fix cross compilation of systemd
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 35ae59af617c..0ba44b1b17a7 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, stdenv, writeTextDir, substituteAll }: +{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: python3Packages.buildPythonApplication rec { version = "0.46.1"; @@ -47,20 +47,20 @@ python3Packages.buildPythonApplication rec { crossFile = writeTextDir "cross-file.conf" '' [binaries] - c = '${stdenv.cc.targetPrefix}cc' - cpp = '${stdenv.cc.targetPrefix}c++' - ar = '${stdenv.cc.bintools.targetPrefix}ar' - strip = '${stdenv.cc.bintools.targetPrefix}strip' + c = '${targetPackages.stdenv.cc.targetPrefix}cc' + cpp = '${targetPackages.stdenv.cc.targetPrefix}c++' + ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar' + strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip' pkgconfig = 'pkg-config' [properties] needs_exe_wrapper = true [host_machine] - system = '${stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${stdenv.targetPlatform.parsed.cpu.family}' - cpu = '${stdenv.targetPlatform.parsed.cpu.name}' - endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${targetPackages.stdenv.targetPlatform.parsed.cpu.family}' + cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} ''; # 0.45 update enabled tests but they are failing @@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec { inherit (stdenv) cc; - isCross = stdenv.buildPlatform != stdenv.hostPlatform; + isCross = stdenv.targetPlatform != stdenv.hostPlatform; meta = with lib; { homepage = http://mesonbuild.com; |