diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-27 22:39:58 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-16 00:21:21 +0000 |
| commit | c71ab32a678a98ce1ec069956bc55d6ea606f55c (patch) | |
| tree | 4a026e21bae3c09815613a4d66bf535c5e1fc449 /pkgs/top-level | |
| parent | 27edd9efb3cea58629091778fcbf1c3ca994f075 (diff) | |
| download | nixlib-c71ab32a678a98ce1ec069956bc55d6ea606f55c.tar nixlib-c71ab32a678a98ce1ec069956bc55d6ea606f55c.tar.gz nixlib-c71ab32a678a98ce1ec069956bc55d6ea606f55c.tar.bz2 nixlib-c71ab32a678a98ce1ec069956bc55d6ea606f55c.tar.lz nixlib-c71ab32a678a98ce1ec069956bc55d6ea606f55c.tar.xz nixlib-c71ab32a678a98ce1ec069956bc55d6ea606f55c.tar.zst nixlib-c71ab32a678a98ce1ec069956bc55d6ea606f55c.zip | |
pkg-config-wrapper: Init
This fixes longstanding build issues
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23bd5ffd7718..680177a2610a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -329,7 +329,11 @@ in # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; - pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; + pkgconfig = buildPackages.pkgconfig.override (old: { + pkg-config = old.pkg-config.override { + fetchurl = stdenv.fetchurlBoot; + }; + }); perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { fetchurl = stdenv.fetchurlBoot; @@ -10737,10 +10741,17 @@ in pkgconf = callPackage ../development/tools/misc/pkgconf {}; - pkg-config = callPackage ../development/tools/misc/pkg-config { }; + pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { }; + pkg-config = callPackage ../build-support/pkg-config-wrapper { + pkg-config = pkg-config-unwrapped; + }; pkgconfig = pkg-config; # added 2018-02-02 - pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; }); + pkg-configUpstream = lowPrio (pkg-config.override (old: { + pkg-config = old.pkg-config.override { + vanilla = true; + }; + })); pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 inherit (nodePackages) postcss-cli; |