Author: eelco
Date: Mon Mar 28 15:46:10 2011
New Revision: 26572
URL: https://svn.nixos.org/websvn/nix/?rev=26572&sc=1
Log:
* Adobe Reader: depend on gdk_pixbuf (from Marc Weber). Also update
to 9.4.2.
Modified:
nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix Mon Mar
28 15:30:48 2011 (r26571)
+++ nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix Mon Mar
28 15:46:10 2011 (r26572)
@@ -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 @@
# 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";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Mar 28 15:30:48
2011 (r26571)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Mar 28 15:46:10
2011 (r26572)
@@ -5653,9 +5653,7 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
