diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 15:46:10 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 15:46:10 +0000 |
commit | 83b3ab465700c1a1651ea2af42ccb599d1da5876 (patch) | |
tree | 9966d4b08b28cb0ae36efc24eb960e12c46594cb /pkgs | |
parent | b18dd910573fc8ecdcf198acf8cc911124974d8b (diff) | |
download | nixpkgs-83b3ab465700c1a1651ea2af42ccb599d1da5876.tar nixpkgs-83b3ab465700c1a1651ea2af42ccb599d1da5876.tar.gz nixpkgs-83b3ab465700c1a1651ea2af42ccb599d1da5876.tar.bz2 nixpkgs-83b3ab465700c1a1651ea2af42ccb599d1da5876.tar.lz nixpkgs-83b3ab465700c1a1651ea2af42ccb599d1da5876.tar.xz nixpkgs-83b3ab465700c1a1651ea2af42ccb599d1da5876.tar.zst nixpkgs-83b3ab465700c1a1651ea2af42ccb599d1da5876.zip |
* Adobe Reader: depend on gdk_pixbuf (from Marc Weber). Also update
to 9.4.2. svn path=/nixpkgs/trunk/; revision=26572
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/adobe-reader/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 24d01dae059..6182931de96 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, libX11, cups, glib, pango, atk, gtk, zlib, libxml2 }: +{ stdenv, fetchurl, libX11, cups, gtkLibs, zlib, libxml2 }: assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "adobe-reader-9.4-1"; + name = "adobe-reader-9.4.2-1"; builder = ./builder.sh; src = fetchurl { - url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.0/enu/AdbeRdr9.4-1_i486linux_enu.tar.bz2; - sha256 = "093msw0b5k3ab0vv7bh4n81fxp51s2lynvsm076i5jvlp71l8adf"; + url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2; + sha256 = "0xm8ngr7lslhxli9ly1g2w7ichip88vpf7lfx1ma0liaw4m2gv0h"; }; # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. @@ -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 e811c8031c0..44b97b4004c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5653,9 +5653,7 @@ let inherit (gnome) libglade libgnomecanvas; }; - adobeReader = callPackage_i686 ../applications/misc/adobe-reader { - inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk; - }; + adobeReader = callPackage_i686 ../applications/misc/adobe-reader { }; akunambol = newScope pkgs.kde4 ../applications/networking/sync/akunambol { }; |