* Use the latest patchelf on x86_64.

svn path=/nixpkgs/trunk/; revision=7867
This commit is contained in:
Eelco Dolstra 2007-02-06 21:12:30 +00:00
parent 9767f074c4
commit b29ff1281b
2 changed files with 7 additions and 6 deletions

View file

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

View file

@ -1101,9 +1101,10 @@ rec {
};
patchelf = useFromStdenv (stdenv ? patchelf) stdenv.patchelf
(import ../development/tools/misc/patchelf {
inherit fetchurl stdenv;
});
(if stdenv.system == "x86_64-linux" then patchelfNew else
(import ../development/tools/misc/patchelf {
inherit fetchurl stdenv;
}));
patchelfNew = import ../development/tools/misc/patchelf/new.nix {
inherit fetchurl stdenv;