about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-05-27 16:07:58 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-05-27 16:07:58 +0000
commit162c0c3e6100461b5ed59144e6a69c179dfde84a (patch)
tree2ccbc5da2c934171bb090dd1b2edd9f0bc1316e6
parent7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b (diff)
downloadnixlib-162c0c3e6100461b5ed59144e6a69c179dfde84a.tar
nixlib-162c0c3e6100461b5ed59144e6a69c179dfde84a.tar.gz
nixlib-162c0c3e6100461b5ed59144e6a69c179dfde84a.tar.bz2
nixlib-162c0c3e6100461b5ed59144e6a69c179dfde84a.tar.lz
nixlib-162c0c3e6100461b5ed59144e6a69c179dfde84a.tar.xz
nixlib-162c0c3e6100461b5ed59144e6a69c179dfde84a.tar.zst
nixlib-162c0c3e6100461b5ed59144e6a69c179dfde84a.zip
mkDerivation: Don't need to specify pkg-config for meson any more
Env var will work fine.
-rw-r--r--pkgs/stdenv/generic/make-derivation.nix10
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;