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

* Acrobat Reader upgraded to 5.0.10.

Browse Source 
* Removed acroread dependency on patchelf (it's in stdenv).

svn path=/nixpkgs/trunk/; revision=2418
This commit is contained in:
Eelco Dolstra 2005-03-15 15:16:40 +00:00
parent be8f1e37a3
commit 47d7e060a5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,16 +6,17 @@ tar xvfz $src
mkdir $out
echo "unpacking reader..."
tar xvf ./COMMON.TAR -C $out
tar xvf ./LINUXRDR.TAR -C $out
tar xvf installers/COMMON.TAR -C $out
tar xvf installers/LINUXRDR.TAR -C $out
glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
patchelf --interpreter $glibc/lib/ld-linux.so.* $out/Reader/intellinux/bin/acroread
sed "s^REPLACE_ME^$out/Reader^" $out/bin/acroread.sh > $out/bin/acroread.sh.tmp
echo "#! /bin/sh" > $out/bin/acroread.sh
echo "#! $SHELL" > $out/bin/acroread.sh
echo "LD_LIBRARY_PATH=$libXt/lib:$libXp/lib:$libXext/lib:$libX11/lib" >> $out/bin/acroread.sh
cat $out/bin/acroread.sh.tmp >> $out/bin/acroread.sh
rm $out/bin/acroread.sh.tmp
chmod 755 $out/bin/acroread.sh
mv $out/bin/acroread.sh $out/bin/acroread

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

@ -1,12 +1,11 @@
{stdenv, fetchurl, patchelf, libXt, libXp, libXext, libX11}:
{stdenv, fetchurl, libXt, libXp, libXext, libX11}:
stdenv.mkDerivation {
name = "acrobat-reader-5.0.9";
name = "acrobat-reader-5.0.10";
builder = ./builder.sh;
src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-509.tar.gz;
md5 = "53b7ca0fc83ab81214ba82050ce89c64";
url = http://ardownload.adobe.com/pub/adobe/acrobatreader/unix/5.x/linux-5010.tar.gz;
md5 = "9721b85d54aab1d9ece37758cc6d64f2";
};
buildInputs = [patchelf];
inherit libXt libXp libXext libX11;
}

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

@ -499,7 +499,7 @@ rec {
apacheAntBlackdown14 = (import ../development/tools/build-managers/apache-ant) {
inherit fetchurl stdenv;
j2sdk = blackdown;
name = "ant-blackdown-1.4.2";
name = "ant-blackdown-1.4.2";
};
apacheAnt15 = (import ../development/tools/build-managers/apache-ant) {
@ -1171,7 +1171,7 @@ rec {
};
acroread = (import ../applications/misc/acrobat-reader) {
inherit fetchurl stdenv patchelf;
inherit fetchurl stdenv;
inherit (xlibs) libXt libXp libXext libX11;
};