diff options
author | John Ericson <git@JohnEricson.me> | 2020-05-27 16:45:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-27 16:45:05 -0400 |
commit | cc1af0751f580f847fedf2c36a26e8063a3042ca (patch) | |
tree | 47da15706e69e7402bb3d78e727b8c4fd0d6f006 /pkgs/stdenv | |
parent | ffe57c4e3e5cb535dff2da7ab311444a37ce390a (diff) | |
parent | 62e6d73a09870174a891d2a8d29a38e62b05efd5 (diff) | |
download | nixlib-cc1af0751f580f847fedf2c36a26e8063a3042ca.tar nixlib-cc1af0751f580f847fedf2c36a26e8063a3042ca.tar.gz nixlib-cc1af0751f580f847fedf2c36a26e8063a3042ca.tar.bz2 nixlib-cc1af0751f580f847fedf2c36a26e8063a3042ca.tar.lz nixlib-cc1af0751f580f847fedf2c36a26e8063a3042ca.tar.xz nixlib-cc1af0751f580f847fedf2c36a26e8063a3042ca.tar.zst nixlib-cc1af0751f580f847fedf2c36a26e8063a3042ca.zip |
Merge pull request #89036 from Ericson2314/fix-mesa-wayland-cross
mesa wayland: Fix/simplify cross
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 09879451d8e4..993ae68e9e81 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -262,7 +262,7 @@ in rec { else if isx86_32 then "x86" else if isx86_64 then "x86_64" else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; - crossFile = builtins.toFile "cross-file.conf" ('' + crossFile = builtins.toFile "cross-file.conf" '' [properties] needs_exe_wrapper = true @@ -271,13 +271,7 @@ in rec { cpu_family = '${cpuFamily stdenv.targetPlatform}' cpu = '${stdenv.targetPlatform.parsed.cpu.name}' endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - '' - # TODO should have target prefix too, issue #86077 - + '' - - [binaries] - pkgconfig = 'pkg-config' - ''); + ''; in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { enableParallelChecking = attrs.enableParallelChecking or true; |