* Adobe Reader: updated to 9.3.3. Make it installable on

x86_64-linux.

svn path=/nixpkgs/trunk/; revision=22956
This commit is contained in:
Eelco Dolstra 2010-08-05 08:54:58 +00:00
parent 9e2e347f28
commit b29496c4be
2 changed files with 5 additions and 5 deletions

View File

@ -3,13 +3,13 @@
assert stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "adobe-reader-9.2-1";
name = "adobe-reader-9.3.3-1";
builder = ./builder.sh;
src = fetchurl {
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.2/enu/AdbeRdr9.2-1_i486linux_enu.tar.bz2;
sha256 = "0067w0kjj2c04342g8c9qvcs49kkiqlxn2zyx9qzlg7a32qfc9l2";
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.3.3/enu/AdbeRdr9.3.3-1_i486linux_enu.tar.bz2;
sha256 = "1qssbdjy3v07agyh55bhsmvzakq9bs3hd6dw032ikwbpvb2gs807";
};
# !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.

View File

@ -5051,8 +5051,8 @@ let
inherit (gnome) libglade libgnomecanvas;
};
adobeReader = callPackage ../applications/misc/adobe-reader {
inherit (gtkLibs) glib pango atk gtk;
adobeReader = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg) ../applications/misc/adobe-reader {
inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk;
};
amsn = callPackage ../applications/networking/instant-messengers/amsn {