diff --git a/pkgs/applications/misc/acrobat-reader/builder.sh b/pkgs/applications/misc/acrobat-reader/builder.sh index a4b26cdeb09..34b547e93aa 100644 --- a/pkgs/applications/misc/acrobat-reader/builder.sh +++ b/pkgs/applications/misc/acrobat-reader/builder.sh @@ -14,15 +14,11 @@ rm $out/Reader/intellinux/plug_ins/PPKLite.api glibc=$(cat $NIX_GCC/nix-support/orig-glibc) -patchelf --interpreter $glibc/lib/ld-linux.so.* $out/Reader/intellinux/bin/acroread - fullPath= for i in $libPath; do fullPath=$fullPath${fullPath:+:}$i/lib done -echo "#! $SHELL" > $out/bin/acroread.tmp -echo "LD_LIBRARY_PATH=$fullPath\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH" >> $out/bin/acroread.tmp -cat $out/bin/acroread >> $out/bin/acroread.tmp -chmod 755 $out/bin/acroread.tmp -mv $out/bin/acroread.tmp $out/bin/acroread +patchelf --interpreter $glibc/lib/ld-linux.so.* \ + --set-rpath $fullPath \ + $out/Reader/intellinux/bin/acroread diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix index d04fbbe0675..4d1f849ab12 100644 --- a/pkgs/applications/misc/acrobat-reader/default.nix +++ b/pkgs/applications/misc/acrobat-reader/default.nix @@ -1,12 +1,13 @@ -{stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib}: +{stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib, patchelf}: stdenv.mkDerivation { - name = "acrobat-reader-7.0"; + name = "acrobat-reader-7.0.1"; builder = ./builder.sh; src = fetchurl { - url = ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr70_linux_enu.tar.gz; - md5 = "0ce9b4fc702f831db97a627ef2629675"; + url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz; + md5 = "79e5a40aca6b49f7015cb1694876f87a"; }; libPath = [libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib]; + buildInputs = [patchelf]; /* !!! temporary */ } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 43ec4458de5..8619cd5943a 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1554,7 +1554,7 @@ rec { inherit (xlibs) libXt libXp libXext libX11; inherit (gtkLibs) glib pango atk gtk; libstdcpp5 = gcc33.gcc; -# patchelf = patchelfNew; + patchelf = patchelfNew; }; eclipse = (import ../applications/editors/eclipse) {