diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-12 14:49:01 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-12 14:49:01 +0000 |
commit | 8202de939dcd6645bd6ef4999833cad3e2f9903d (patch) | |
tree | ba104ef18412edd48fc7ac05873f9d8a6237036b | |
parent | d78a4040639e50cecd6d6c2def9bedd7c35f0d97 (diff) | |
download | nixpkgs-8202de939dcd6645bd6ef4999833cad3e2f9903d.tar nixpkgs-8202de939dcd6645bd6ef4999833cad3e2f9903d.tar.gz nixpkgs-8202de939dcd6645bd6ef4999833cad3e2f9903d.tar.bz2 nixpkgs-8202de939dcd6645bd6ef4999833cad3e2f9903d.tar.lz nixpkgs-8202de939dcd6645bd6ef4999833cad3e2f9903d.tar.xz nixpkgs-8202de939dcd6645bd6ef4999833cad3e2f9903d.tar.zst nixpkgs-8202de939dcd6645bd6ef4999833cad3e2f9903d.zip |
* Acrobat Reader -> Adobe Reader, and updated to version 9.0.1.
Removed the fastStart option; it seems to start fast enough without it nowadays. Include CUPS in the RPATH so that the printer dialog box shows actual printers (especially useful since KDE 4 no longer include the kprinter program ;-). svn path=/nixpkgs/trunk/; revision=15570
-rw-r--r-- | pkgs/applications/misc/acrobat-reader/builder.sh | 29 | ||||
-rw-r--r-- | pkgs/applications/misc/acrobat-reader/default.nix | 30 | ||||
-rw-r--r-- | pkgs/applications/misc/adobe-reader/builder.sh | 26 | ||||
-rw-r--r-- | pkgs/applications/misc/adobe-reader/default.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
5 files changed, 55 insertions, 65 deletions
diff --git a/pkgs/applications/misc/acrobat-reader/builder.sh b/pkgs/applications/misc/acrobat-reader/builder.sh deleted file mode 100644 index 2efdd78beae..00000000000 --- a/pkgs/applications/misc/acrobat-reader/builder.sh +++ /dev/null @@ -1,29 +0,0 @@ -source $stdenv/setup - -echo "unpacking $src..." -tar xvfz $src - -mkdir $out - -echo "unpacking reader..." -tar xvf AdobeReader/COMMON.TAR -C $out -tar xvf AdobeReader/ILINXR.TAR -C $out - -# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it). -rm $out/Reader/intellinux/plug_ins/PPKLite.api - -if test -n "$fastStart"; then - echo "removing plugins..." - rm -v $(ls $out/Reader/intellinux/plug_ins/*.api | grep -v SearchFind) -fi - -fullPath= -for i in $libPath; do - fullPath=$fullPath${fullPath:+:}$i/lib -done - -patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $fullPath \ - $out/Reader/intellinux/bin/acroread - -substituteInPlace $out/bin/acroread --replace /lib:/usr/lib /no-such-path --replace /bin/pwd pwd diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix deleted file mode 100644 index bc14b0cb45d..00000000000 --- a/pkgs/applications/misc/acrobat-reader/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ xineramaSupport ? false -, stdenv, fetchurl, libXt, libXp, libXext, libX11, libXinerama ? null -, glib, pango, atk, gtk, libstdcpp5, zlib -, fastStart ? false -}: - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "acrobat-reader-7.0.9"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/AdobeReader_enu-7.0.9-1.i386.tar.gz; - sha256 = "0qs8v57gamkk243f44yqxic93izf0bn2d9l4wwbqqy1jv5s125hy"; - }; - - libPath = [ - libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib - (if xineramaSupport then libXinerama else null) - ]; - - inherit fastStart; - - meta = { - description = "Adobe Reader, a viewer for PDF documents"; - homepage = http://www.adobe.com/products/reader; - }; -} diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh new file mode 100644 index 00000000000..0b5ed4a4029 --- /dev/null +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -0,0 +1,26 @@ +source $stdenv/setup + +echo "unpacking $src..." +tar xvfa $src + +ensureDir $out + +echo "unpacking reader..." +tar xvf AdobeReader/COMMON.TAR -C $out +tar xvf AdobeReader/ILINXR.TAR -C $out + +# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it). +rm $out/Adobe/Reader*/Reader/intellinux/plug_ins/PPKLite.api + +patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $libPath \ + $out/Adobe/Reader*/Reader/intellinux/bin/acroread + +# The "xargs -r" is to shut up a warning when Mozilla can't be found. +substituteInPlace $out/Adobe/Reader*/bin/acroread \ + --replace /bin/pwd $(type -P pwd) \ + --replace /bin/ls $(type -P ls) \ + --replace xargs "xargs -r" + +ensureDir $out/bin +ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix new file mode 100644 index 00000000000..1f1ad4452f4 --- /dev/null +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, libX11, cups, glib, pango, atk, gtk, zlib, libxml2 }: + +assert stdenv.system == "i686-linux"; + +stdenv.mkDerivation { + name = "adobe-reader-9.1.0-1"; + + builder = ./builder.sh; + + src = fetchurl { + url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/enu/AdbeRdr9.1.0-1_i486linux_enu.tar.bz2; + sha256 = "0liynlmpgmb23fpmbh83mjzfmq798q1rbpymxjgasc2sn76vd0y7"; + }; + + # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. + # We should probably remove those and use the regular Nixpkgs + # versions. + + libPath = stdenv.lib.makeLibraryPath + [ stdenv.gcc.gcc libX11 glib pango atk gtk zlib libxml2 cups ]; + + meta = { + description = "Adobe Reader, a viewer for PDF documents"; + homepage = http://www.adobe.com/products/reader; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dbcba71849..d63708f1901 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5607,13 +5607,10 @@ let inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas; }; - acroread = import ../applications/misc/acrobat-reader { - inherit fetchurl stdenv zlib; - inherit (xlibs) libXt libXp libXext libX11 libXinerama; + adobeReader = import ../applications/misc/adobe-reader { + inherit fetchurl stdenv zlib libxml2 cups; + inherit (xlibs) libX11; inherit (gtkLibs) glib pango atk gtk; - libstdcpp5 = gcc33.gcc; - xineramaSupport = true; - fastStart = getConfig ["acroread" "fastStart"] true; }; amsn = import ../applications/networking/instant-messengers/amsn { |