alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fixing wrong merge

Browse source 
svn path=/nixpkgs/trunk/; revision=15851
This commit is contained in:
Michael Raskin 2009-06-04 11:27:41 +00:00
parent 73f036cebd
commit b98aa7e401
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/top-level/all-packages.nix
View file

@ -3579,9 +3579,6 @@ let
inherit fetchurl stdenv zlib;
};
libproxy = builderDefsPackage (import ../development/libraries/libproxy) {
};
libproxy = import ../development/libraries/libproxy {
inherit stdenv fetchurl;
};
@ -4050,7 +4047,7 @@ let
};
webkit = builderDefsPackage (import ../development/libraries/webkit) {
inherit (gnome26) gtk atk pango libsoup gtkdoc;
inherit (gnome) gtk atk pango libsoup gtkdoc;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool