public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkDerivation: Don't need to specify pkg-config for meson any more

Browse Source 
Env var will work fine.
This commit is contained in:
John Ericson 2020-05-27 16:07:58 +00:00
parent 7e9d807f2c
commit 162c0c3e61
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/stdenv/generic/make-derivation.nix
View File

@ -262,7 +262,7 @@ in rec {
else if isx86_32 then "x86" else if isx86_32 then "x86"
else if isx86_64 then "x86_64" else if isx86_64 then "x86_64"
else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits;
crossFile = builtins.toFile "cross-file.conf" ('' crossFile = builtins.toFile "cross-file.conf" ''
[properties] [properties]
needs_exe_wrapper = true needs_exe_wrapper = true
@ -271,13 +271,7 @@ in rec {
cpu_family = '${cpuFamily stdenv.targetPlatform}' cpu_family = '${cpuFamily stdenv.targetPlatform}'
cpu = '${stdenv.targetPlatform.parsed.cpu.name}' cpu = '${stdenv.targetPlatform.parsed.cpu.name}'
endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} 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; in [ "--cross-file=${crossFile}" ] ++ mesonFlags;
} // lib.optionalAttrs (attrs.enableParallelBuilding or false) { } // lib.optionalAttrs (attrs.enableParallelBuilding or false) {
enableParallelChecking = attrs.enableParallelChecking or true; enableParallelChecking = attrs.enableParallelChecking or true;