pkg-config-wrapper: Init

This fixes longstanding build issues
2020-04-27 22:39:58 -04:00
parent 27edd9efb3
commit c71ab32a67
9 changed files with 208 additions and 12 deletions
--- a/pkgs/development/tools/misc/pkg-config/default.nix
+++ b/pkgs/development/tools/misc/pkg-config/default.nix
@@ -6,8 +6,6 @@ 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";
--- a/pkgs/development/tools/misc/pkg-config/setup-hook.sh
+++ b/pkgs/development/tools/misc/pkg-config/setup-hook.sh
@@ -1,6 +0,0 @@
-addPkgConfigPath () {
-    addToSearchPath PKG_CONFIG_PATH $1/lib/pkgconfig
-    addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig
-}
-
-addEnvHooks "$targetOffset" addPkgConfigPath