summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2005-03-10 13:48:13 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2005-03-10 13:48:13 +0000
commit4ab54186007ffb88f7cee3be9cf0e4ecaa899c6a (patch)
treedd041bce7bf9d1151018bd519cb3136e78bd2aac
parent72951815f895c9be05bef111ae21c82bf0e3ce48 (diff)
* Fix duplicate attributes.
svn path=/nixpkgs/branches/one-click/; revision=2366
-rw-r--r--pkgs/system/all-packages-generic.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index b03dae1ae4930..dbe5080c99c00 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -605,7 +605,7 @@ rec {
             libtiff libjpeg libpng;
   };
 
-  gtkLibs22 = import ../development/libraries/gtk-libs-2.4 {
+  gtkLibs24 = import ../development/libraries/gtk-libs-2.4 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng;
   };
@@ -676,7 +676,6 @@ rec {
   zvbi = (import ../development/libraries/zvbi) {
     inherit fetchurl stdenv libpng x11;
     pngSupport = true;
-    libpng = libpng;
   };
 
   rte = (import ../development/libraries/rte) {