diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-27 15:15:20 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-27 15:15:20 +0000 |
| commit | 714da445bbecad486eecd154827a6c528fdd28b4 (patch) | |
| tree | 4aca2770a27491f5f4f4915bdec65113c4be39b8 /pkgs/top-level | |
| parent | 8a89f06527e91603242053603f9c4318ef973182 (diff) | |
| download | nixlib-714da445bbecad486eecd154827a6c528fdd28b4.tar nixlib-714da445bbecad486eecd154827a6c528fdd28b4.tar.gz nixlib-714da445bbecad486eecd154827a6c528fdd28b4.tar.bz2 nixlib-714da445bbecad486eecd154827a6c528fdd28b4.tar.lz nixlib-714da445bbecad486eecd154827a6c528fdd28b4.tar.xz nixlib-714da445bbecad486eecd154827a6c528fdd28b4.tar.zst nixlib-714da445bbecad486eecd154827a6c528fdd28b4.zip | |
* pkgconfig 0.21 is now the default.
* Some hackery to get Firefox to build again. svn path=/nixpkgs/trunk/; revision=8076
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9c267790c80..e77975ab022d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1118,11 +1118,13 @@ rec { * pkgconfig is optionally taken from the stdenv to allow bootstrapping * of glib and pkgconfig itself on MinGW. */ - pkgconfig = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig + pkgconfigOld = 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; }; @@ -2732,7 +2734,7 @@ rec { }; MPlayerPlugin = import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { - inherit fetchurl stdenv pkgconfig firefox; + inherit fetchurl stdenv pkgconfig firefox gettext; inherit (xlibs) libXpm; # !!! should depend on MPlayer }; |