public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Get rid of old pkgconfigs.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8150
This commit is contained in:
Eelco Dolstra 2007-03-02 19:14:24 +00:00
parent 2d33b25877
commit 7eb82b5ace
5 changed files with 15 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/tools/misc/pkgconfig/default.nix
View File

@ -1,11 +1,20 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pkgconfig-0.15.0"; name = "pkgconfig-0.21";
builder = ./builder.sh; builder = ./builder.sh;
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/pkgconfig-0.15.0.tar.gz; url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz;
md5 = "a7e4f60a6657dbc434334deb594cc242"; 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";
})
];
} }

11
pkgs/development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix
View File

@ -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";
};
}

11
pkgs/development/tools/misc/pkgconfig/pkgconfig-0.20.nix
View File

@ -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";
};
}

21
pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
View File

@ -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";
})
];
}

18
pkgs/top-level/all-packages.nix
View File

@ -1118,21 +1118,11 @@ rec {
* pkgconfig is optionally taken from the stdenv to allow bootstrapping * pkgconfig is optionally taken from the stdenv to allow bootstrapping
* of glib and pkgconfig itself on MinGW. * of glib and pkgconfig itself on MinGW.
*/ */
pkgconfigOld = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig pkgconfig = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig
(import ../development/tools/misc/pkgconfig { (import ../development/tools/misc/pkgconfig {
inherit fetchurl stdenv; 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 { scons = import ../development/tools/build-managers/scons {
inherit fetchurl stdenv python; inherit fetchurl stdenv python;
}; };
@ -1241,8 +1231,7 @@ rec {
}; };
cairo = import ../development/libraries/cairo { cairo = import ../development/libraries/cairo {
inherit fetchurl stdenv x11 fontconfig freetype zlib libpng; inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
pkgconfig = pkgconfig_latest;
}; };
chmlib = import ../development/libraries/chmlib { chmlib = import ../development/libraries/chmlib {
@ -2596,8 +2585,7 @@ rec {
}; };
firefox = import ../applications/networking/browsers/firefox { firefox = import ../applications/networking/browsers/firefox {
inherit fetchurl stdenv perl zip libjpeg libpng zlib cairo; inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
pkgconfig = pkgconfig_latest;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libIDL; inherit (gnome) libIDL;
inherit (xlibs) libXi; inherit (xlibs) libXi;