[Nix-dev] [***SPAM***] [PATCH] fix adobeReader by adding gdk_pixbuf to libPath

[Marc Weber]

---
 pkgs/applications/misc/adobe-reader/default.nix |   10 ++++++++--
 pkgs/top-level/all-packages.nix                 |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index 24d01da..cc05328 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, cups, glib, pango, atk, gtk, zlib, libxml2 }:
+{ stdenv, fetchurl, libX11, cups, zlib, libxml2, gtkLibs }:
 
 assert stdenv.system == "i686-linux";
 
@@ -17,7 +17,13 @@ stdenv.mkDerivation {
   # versions.
   
   libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.gcc.gcc libX11 glib pango atk gtk zlib libxml2 cups ];
+    [ stdenv.gcc.gcc libX11 zlib libxml2 cups 
+      gtkLibs.pango
+      gtkLibs.atk
+      gtkLibs.gtk
+      gtkLibs.glib
+      gtkLibs.gdk_pixbuf
+    ];
   
   meta = {
     description = "Adobe Reader, a viewer for PDF documents";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d70c53..be80fbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5584,7 +5584,7 @@ let
   };
 
   adobeReader = callPackage_i686 ../applications/misc/adobe-reader {
-    inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk;
+    gtkLibs = pkgsi686Linux.gtkLibs;
   };
 
   akunambol = newScope pkgs.kde4 ../applications/networking/sync/akunambol { };
-- 
1.6.6.2