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

* Use patchelf 0.3.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8767
This commit is contained in:
Eelco Dolstra 2007-05-24 16:00:05 +00:00
parent d384ef5673
commit e6779a3701
5 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/taxes/aangifte-2005/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, patchelf, libX11, libXext}: {stdenv, fetchurl, libX11, libXext}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "aangifte2005-1"; name = "aangifte2005-1";
@ -9,6 +9,5 @@ stdenv.mkDerivation {
md5 = "9cc709b8ad041f4b20154ff1491d0436"; md5 = "9cc709b8ad041f4b20154ff1491d0436";
}; };
buildInputs = [patchelf];
inherit libX11 libXext; inherit libX11 libXext;
} }

3
pkgs/applications/taxes/aangifte-2006/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, patchelf, libX11, libXext}: {stdenv, fetchurl, libX11, libXext}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "aangifte2006-1"; name = "aangifte2006-1";
@ -9,7 +9,6 @@ stdenv.mkDerivation {
sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc"; sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc";
}; };
buildInputs = [patchelf];
inherit libX11 libXext; inherit libX11 libXext;
meta = { meta = {

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

@ -1,9 +1,15 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "patchelf-0.1"; name = "patchelf-0.3";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/nix/patchelf-0.1/patchelf-0.1.tar.bz2; url = http://nix.cs.uu.nl/dist/nix/patchelf-0.3/patchelf-0.3.tar.bz2;
md5 = "bc20c173bf8bd590fa8ee0f348a563be"; md5 = "20d77052ae559c60e6c5efb6ea95af9b";
};
meta = {
homepage = "http://nix.cs.uu.nl/patchelf.html";
license = "GPL";
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
}; };
} }

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

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "patchelf-0.3pre7826";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/nix/patchelf-0.3pre7826/patchelf-0.3pre7826.tar.bz2;
sha256 = "0wnb5a5964dgp55awygvzw2ssa6j63s568qg4i6kjfx11vvl3zqi";
};
}

11
pkgs/top-level/all-packages.nix
View File

@ -1079,14 +1079,9 @@ rec {
}; };
patchelf = useFromStdenv (stdenv ? patchelf) stdenv.patchelf patchelf = useFromStdenv (stdenv ? patchelf) stdenv.patchelf
(if stdenv.system == "x86_64-linux" then patchelfNew else (import ../development/tools/misc/patchelf {
(import ../development/tools/misc/patchelf {
inherit fetchurl stdenv; inherit fetchurl stdenv;
})); });
patchelfNew = import ../development/tools/misc/patchelf/new.nix {
inherit fetchurl stdenv;
};
/** /**
* pkgconfig is optionally taken from the stdenv to allow bootstrapping * pkgconfig is optionally taken from the stdenv to allow bootstrapping
@ -2511,13 +2506,11 @@ rec {
aangifte2005 = import ../applications/taxes/aangifte-2005 { aangifte2005 = import ../applications/taxes/aangifte-2005 {
inherit stdenv fetchurl; inherit stdenv fetchurl;
inherit (xlibs) libX11 libXext; inherit (xlibs) libX11 libXext;
patchelf = patchelfNew;
}; };
aangifte2006 = import ../applications/taxes/aangifte-2006 { aangifte2006 = import ../applications/taxes/aangifte-2006 {
inherit stdenv fetchurl; inherit stdenv fetchurl;
inherit (xlibs) libX11 libXext; inherit (xlibs) libX11 libXext;
patchelf = patchelfNew;
}; };
abiword = import ../applications/office/abiword { abiword = import ../applications/office/abiword {