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

* Acrobat Reader updated to 7.0.1. Also use the new patchelf to 

remove the need for a wrapper script.

svn path=/nixpkgs/trunk/; revision=3996
This commit is contained in:
Eelco Dolstra 2005-10-02 22:24:09 +00:00
parent efdb847441
commit 1dbb681b29
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/acrobat-reader/builder.sh
View File

@ -14,15 +14,11 @@ rm $out/Reader/intellinux/plug_ins/PPKLite.api
glibc=$(cat $NIX_GCC/nix-support/orig-glibc) glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
patchelf --interpreter $glibc/lib/ld-linux.so.* $out/Reader/intellinux/bin/acroread
fullPath= fullPath=
for i in $libPath; do for i in $libPath; do
fullPath=$fullPath${fullPath:+:}$i/lib fullPath=$fullPath${fullPath:+:}$i/lib
done done
echo "#! $SHELL" > $out/bin/acroread.tmp patchelf --interpreter $glibc/lib/ld-linux.so.* \
echo "LD_LIBRARY_PATH=$fullPath\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH" >> $out/bin/acroread.tmp --set-rpath $fullPath \
cat $out/bin/acroread >> $out/bin/acroread.tmp $out/Reader/intellinux/bin/acroread
chmod 755 $out/bin/acroread.tmp
mv $out/bin/acroread.tmp $out/bin/acroread

9
pkgs/applications/misc/acrobat-reader/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "acrobat-reader-7.0"; name = "acrobat-reader-7.0.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr70_linux_enu.tar.gz; url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz;
md5 = "0ce9b4fc702f831db97a627ef2629675"; md5 = "79e5a40aca6b49f7015cb1694876f87a";
}; };
libPath = [libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib]; libPath = [libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib];
buildInputs = [patchelf]; /* !!! temporary */
} }

2
pkgs/system/all-packages-generic.nix
View File

@ -1554,7 +1554,7 @@ rec {
inherit (xlibs) libXt libXp libXext libX11; inherit (xlibs) libXt libXp libXext libX11;
inherit (gtkLibs) glib pango atk gtk; inherit (gtkLibs) glib pango atk gtk;
libstdcpp5 = gcc33.gcc; libstdcpp5 = gcc33.gcc;
# patchelf = patchelfNew; patchelf = patchelfNew;
}; };
eclipse = (import ../applications/editors/eclipse) { eclipse = (import ../applications/editors/eclipse) {