diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/pkg-config')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/pkg-config/setup-hook.sh | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix b/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix index 494b8d893d42..84f6c330f8c5 100644 --- a/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix @@ -6,20 +6,21 @@ stdenv.mkDerivation rec { pname = "pkg-config"; version = "0.29.2"; - setupHook = ./setup-hook.sh; - src = fetchurl { url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; + outputs = [ "out" "man" "doc" ]; + # Process Requires.private properly, see - # http://bugs.freedesktop.org/show_bug.cgi?id=4738. + # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to + # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 patches = optional (!vanilla) ./requires-private.patch ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; # These three tests fail due to a (desired) behavior change from our ./requires-private.patch - postPatch = '' + postPatch = if vanilla then null else '' rm -f check/check-requires-private check/check-gtk check/missing ''; diff --git a/nixpkgs/pkgs/development/tools/misc/pkg-config/setup-hook.sh b/nixpkgs/pkgs/development/tools/misc/pkg-config/setup-hook.sh deleted file mode 100644 index 34a9b9f1173b..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/pkg-config/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -addPkgConfigPath () { - addToSearchPath PKG_CONFIG_PATH $1/lib/pkgconfig - addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig -} - -addEnvHooks "$targetOffset" addPkgConfigPath |