diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-06 21:12:30 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-06 21:12:30 +0000 |
| commit | b29ff1281b74fec74236cb88286daec53a626557 (patch) | |
| tree | 9ebbebffd302774e164635c74080f3c79af74632 /pkgs/top-level | |
| parent | 9767f074c4ce8072109f4d7b58bb7d10370f6479 (diff) | |
| download | nixlib-b29ff1281b74fec74236cb88286daec53a626557.tar nixlib-b29ff1281b74fec74236cb88286daec53a626557.tar.gz nixlib-b29ff1281b74fec74236cb88286daec53a626557.tar.bz2 nixlib-b29ff1281b74fec74236cb88286daec53a626557.tar.lz nixlib-b29ff1281b74fec74236cb88286daec53a626557.tar.xz nixlib-b29ff1281b74fec74236cb88286daec53a626557.tar.zst nixlib-b29ff1281b74fec74236cb88286daec53a626557.zip | |
* Use the latest patchelf on x86_64.
svn path=/nixpkgs/trunk/; revision=7867
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22babdb3b96f..0533da6cb789 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |