public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Adobe Reader: depend on gdk_pixbuf (from Marc Weber). Also update

Browse Source 
to 9.4.2.

svn path=/nixpkgs/trunk/; revision=26572
This commit is contained in:
Eelco Dolstra
2011-03-28 15:46:10 +00:00
parent b18dd91057
commit 83b3ab4657
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/adobe-reader/default.nix
+11 -5
View File
@@ -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"; assert stdenv.system == "i686-linux";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "adobe-reader-9.4-1"; name = "adobe-reader-9.4.2-1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.0/enu/AdbeRdr9.4-1_i486linux_enu.tar.bz2; url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2;
sha256 = "093msw0b5k3ab0vv7bh4n81fxp51s2lynvsm076i5jvlp71l8adf"; sha256 = "0xm8ngr7lslhxli9ly1g2w7ichip88vpf7lfx1ma0liaw4m2gv0h";
}; };
# !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
@@ -17,7 +17,13 @@ stdenv.mkDerivation {
# versions. # versions.
libPath = stdenv.lib.makeLibraryPath 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 = { meta = {
description = "Adobe Reader, a viewer for PDF documents"; description = "Adobe Reader, a viewer for PDF documents";
pkgs/top-level/all-packages.nix
+1 -3
View File
@@ -5653,9 +5653,7 @@ let
inherit (gnome) libglade libgnomecanvas; inherit (gnome) libglade libgnomecanvas;
}; };
adobeReader = callPackage_i686 ../applications/misc/adobe-reader { adobeReader = callPackage_i686 ../applications/misc/adobe-reader { };
inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk;
};
akunambol = newScope pkgs.kde4 ../applications/networking/sync/akunambol { }; akunambol = newScope pkgs.kde4 ../applications/networking/sync/akunambol { };