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

* Use PatchELF 0.1.

Browse Source 
svn path=/nixpkgs/trunk/; revision=4062
This commit is contained in:
Eelco Dolstra 2005-10-11 13:31:33 +00:00
parent 1cc9ec7f6d
commit 3c1c258aa5
8 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/eclipse/default.nix
View File

@ -1,4 +1,4 @@
{fetchurl, stdenv, makeWrapper, patchelf, jdk, gtk, glib, libXtst}: {fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst}:
let { let {
body = body =
@ -7,7 +7,6 @@ let {
builder = ./builder.sh; builder = ./builder.sh;
src = bindist; src = bindist;
inherit makeWrapper jdk; inherit makeWrapper jdk;
buildInputs = [patchelf];
libraries = [gtk glib libXtst]; libraries = [gtk glib libXtst];
}; };

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib, patchelf}: {stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "acrobat-reader-7.0.1"; name = "acrobat-reader-7.0.1";
@ -7,7 +7,5 @@ stdenv.mkDerivation {
url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz; url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz;
md5 = "79e5a40aca6b49f7015cb1694876f87a"; 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 */
} }

4
pkgs/development/compilers/ghc/boot.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, patchelf, readline, ncurses}: {stdenv, fetchurl, perl, readline, ncurses}:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
url = http://www.haskell.org/ghc/dist/6.4.1/ghc-6.4.1-i386-unknown-linux.tar.bz2; url = http://www.haskell.org/ghc/dist/6.4.1/ghc-6.4.1-i386-unknown-linux.tar.bz2;
md5 = "9cd18a8e946da91b373b8ec855cd842e"; md5 = "9cd18a8e946da91b373b8ec855cd842e";
}; };
buildInputs = [perl patchelf]; buildInputs = [perl];
propagatedBuildInputs = [readline ncurses]; propagatedBuildInputs = [readline ncurses];
inherit readline ncurses; inherit readline ncurses;
} }

6
pkgs/development/compilers/helium/default.nix
View File

@ -3,11 +3,11 @@
assert ghc != null; assert ghc != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "helium-1.2"; name = "helium-1.5";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://www.cs.uu.nl/helium/distr/helium-1.2-src.tar.gz; url = http://www.cs.uu.nl/helium/distr/helium-1.5-src.tar.gz;
md5 = "6ea1d6e4436e137d75f5354b4758f299"; md5 = "b25fbee324a54059789eb1b4d62aa048";
}; };
inherit ghc; inherit ghc;
} }

4
pkgs/development/compilers/jdk/jdk5-sun-linux.nix
View File

@ -9,7 +9,7 @@
* @author Martin Bravenboer <martin@cs.uu.nl> * @author Martin Bravenboer <martin@cs.uu.nl>
*/ */
{ swingSupport ? true { swingSupport ? true
, stdenv, fetchurl, unzip, patchelf, libX11 ? null, libXext ? null , stdenv, fetchurl, unzip, libX11 ? null, libXext ? null
}: }:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
@ -23,7 +23,7 @@ assert swingSupport -> libX11 != null && libXext != null;
dirname = "jdk1.5.0_05"; dirname = "jdk1.5.0_05";
pathname = "/tmp/jdk-1_5_0_05-linux-i586.bin"; pathname = "/tmp/jdk-1_5_0_05-linux-i586.bin";
md5 = "2f83bf2a38fff1f8ac51b02ec7391ca3"; md5 = "2f83bf2a38fff1f8ac51b02ec7391ca3";
buildInputs = [unzip patchelf]; buildInputs = [unzip];
libraries = libraries =
(if swingSupport then [libX11 libXext] else []); (if swingSupport then [libX11 libXext] else []);
} // {inherit swingSupport;}) } // {inherit swingSupport;})

6
pkgs/development/tools/misc/patchelf/default.nix
View File

@ -1,9 +1,9 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "patchelf-0.1pre2286"; name = "patchelf-0.1";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/nix/patchelf-0.1pre2286/patchelf-0.1pre2286.tar.gz; url = http://nix.cs.uu.nl/dist/nix/patchelf-0.1/patchelf-0.1.tar.bz2;
md5 = "2b1377e6745c239255b3f4a6ba6c0c87"; md5 = "bc20c173bf8bd590fa8ee0f348a563be";
}; };
} }

9
pkgs/development/tools/misc/patchelf/new.nix
View File

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "patchelf-0.1pre4005";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/nix/patchelf-0.1pre4005/patchelf-0.1pre4005.tar.gz;
md5 = "95f0a2025d72a8499d608cc706c097b3";
};
}

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

@ -295,10 +295,6 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
patchelfNew = (import ../development/tools/misc/patchelf/new.nix) {
inherit fetchurl stdenv;
};
gnum4 = (import ../development/tools/misc/gnum4) { gnum4 = (import ../development/tools/misc/gnum4) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -515,7 +511,6 @@ rec {
else else
(import ../development/compilers/jdk) { (import ../development/compilers/jdk) {
inherit fetchurl stdenv unzip; inherit fetchurl stdenv unzip;
patchelf = patchelfNew;
inherit (xlibs) libX11 libXext; inherit (xlibs) libX11 libXext;
}; };
@ -569,7 +564,6 @@ rec {
ghcboot = (import ../development/compilers/ghc/boot.nix) { ghcboot = (import ../development/compilers/ghc/boot.nix) {
inherit fetchurl stdenv perl ncurses; inherit fetchurl stdenv perl ncurses;
readline = readline4; readline = readline4;
patchelf = patchelfNew;
}; };
ghc = (import ../development/compilers/ghc) { ghc = (import ../development/compilers/ghc) {
@ -1581,14 +1575,12 @@ 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;
}; };
eclipse = (import ../applications/editors/eclipse) { eclipse = (import ../applications/editors/eclipse) {
inherit fetchurl stdenv makeWrapper jdk; inherit fetchurl stdenv makeWrapper jdk;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
inherit (xlibs) libXtst; inherit (xlibs) libXtst;
patchelf = patchelfNew;
}; };
monodevelop = (import ../applications/editors/monodevelop) { monodevelop = (import ../applications/editors/monodevelop) {