* Get rid of old pkgconfigs.

svn path=/nixpkgs/trunk/; revision=8150

5 files changed, 15 insertions, 61 deletions

diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index ba5b3a95ac78..520def967f47 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,11 +1,20 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "pkgconfig-0.15.0";
+  name = "pkgconfig-0.21";
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pkgconfig-0.15.0.tar.gz;
-    md5 = "a7e4f60a6657dbc434334deb594cc242";
+    url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz;
+    md5 = "476f45fab1504aac6697aa7785f0ab91";
   };
+
+  patches = [
+    # Process Requires.private properly, see
+    # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
+    (fetchurl {
+      url = http://bugs.freedesktop.org/attachment.cgi?id=8494;
+      sha256 = "1pcrdbb7dypg2biy0yqc7bdxak5zii8agqljdvk7j4wbyghpqzws";
+    })
+  ];
 }
diff --git a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix
deleted file mode 100644
index ec2fef768c4b..000000000000
--- a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "pkgconfig-0.17.2";
-  builder = ./builder.sh;
-  setupHook = ./setup-hook.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pkgconfig-0.17.2.tar.gz;
-    md5 = "a0829ae71b586e027183b2a1cfe0ce88";
-  };
-}
diff --git a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.20.nix b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.20.nix
deleted file mode 100644
index 495f1c1820cf..000000000000
--- a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.20.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "pkgconfig-0.20";
-  builder = ./builder.sh;
-  setupHook = ./setup-hook.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.20.tar.gz;
-    md5 = "fb42402593e4198bc252ab248dd4158b";
-  };
-}
diff --git a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
deleted file mode 100644
index be8c4febe03a..000000000000
--- a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "pkgconfig-0.21";
-  builder = ./builder.sh;
-  setupHook = ./setup-hook.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz;
-    md5 = "476f45fab1504aac6697aa7785f0ab91";
-  };
-
-  patches = [
-    # Process Requires.private properly, see
-    # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
-    (fetchurl {
-      name = "pkgconfig-8494.patch";
-      url = http://bugs.freedesktop.org/attachment.cgi?id=8494;
-      sha256 = "1pcrdbb7dypg2biy0yqc7bdxak5zii8agqljdvk7j4wbyghpqzws";
-    })
-  ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9aa7f144c4d1..80350d1f454d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1118,21 +1118,11 @@ rec {
    * pkgconfig is optionally taken from the stdenv to allow bootstrapping
    * of glib and pkgconfig itself on MinGW.
    */
-  pkgconfigOld = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig
+  pkgconfig = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig
     (import ../development/tools/misc/pkgconfig {
       inherit fetchurl stdenv;
     });
 
-  pkgconfig = pkgconfig_latest;
-
-  pkgconfig017x = import ../development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix {
-    inherit fetchurl stdenv;
-  };
-
-  pkgconfig_latest = import ../development/tools/misc/pkgconfig/pkgconfig-0.21.nix {
-    inherit fetchurl stdenv;
-  };
-
   scons = import ../development/tools/build-managers/scons {
     inherit fetchurl stdenv python;
   };
@@ -1241,8 +1231,7 @@ rec {
   };
 
   cairo = import ../development/libraries/cairo {
-    inherit fetchurl stdenv x11 fontconfig freetype zlib libpng;
-    pkgconfig = pkgconfig_latest;
+    inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
   };
 
   chmlib = import ../development/libraries/chmlib {
@@ -2596,8 +2585,7 @@ rec {
   };
 
   firefox = import ../applications/networking/browsers/firefox {
-    inherit fetchurl stdenv perl zip libjpeg libpng zlib cairo;
-    pkgconfig = pkgconfig_latest;
+    inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
     inherit (xlibs) libXi;