diff --git a/pkgs/applications/taxes/aangifte-2005/default.nix b/pkgs/applications/taxes/aangifte-2005/default.nix index 8db1c8dfd43..03ba20b11da 100644 --- a/pkgs/applications/taxes/aangifte-2005/default.nix +++ b/pkgs/applications/taxes/aangifte-2005/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, patchelf, libX11, libXext}: +{stdenv, fetchurl, libX11, libXext}: stdenv.mkDerivation { name = "aangifte2005-1"; @@ -9,6 +9,5 @@ stdenv.mkDerivation { md5 = "9cc709b8ad041f4b20154ff1491d0436"; }; - buildInputs = [patchelf]; inherit libX11 libXext; } diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix index d4ab104dcc6..8bf5ddeee40 100644 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ b/pkgs/applications/taxes/aangifte-2006/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, patchelf, libX11, libXext}: +{stdenv, fetchurl, libX11, libXext}: stdenv.mkDerivation { name = "aangifte2006-1"; @@ -9,7 +9,6 @@ stdenv.mkDerivation { sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc"; }; - buildInputs = [patchelf]; inherit libX11 libXext; meta = { diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index da51f3acac8..27b1b73b67c 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,9 +1,15 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "patchelf-0.1"; + name = "patchelf-0.3"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/nix/patchelf-0.1/patchelf-0.1.tar.bz2; - md5 = "bc20c173bf8bd590fa8ee0f348a563be"; + url = http://nix.cs.uu.nl/dist/nix/patchelf-0.3/patchelf-0.3.tar.bz2; + 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"; }; } diff --git a/pkgs/development/tools/misc/patchelf/new.nix b/pkgs/development/tools/misc/patchelf/new.nix deleted file mode 100644 index 6ada2e2508c..00000000000 --- a/pkgs/development/tools/misc/patchelf/new.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a76d23911fe..1e16c9d01a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1079,14 +1079,9 @@ rec { }; 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; - })); - - patchelfNew = import ../development/tools/misc/patchelf/new.nix { - inherit fetchurl stdenv; - }; + }); /** * pkgconfig is optionally taken from the stdenv to allow bootstrapping @@ -2511,13 +2506,11 @@ rec { aangifte2005 = import ../applications/taxes/aangifte-2005 { inherit stdenv fetchurl; inherit (xlibs) libX11 libXext; - patchelf = patchelfNew; }; aangifte2006 = import ../applications/taxes/aangifte-2006 { inherit stdenv fetchurl; inherit (xlibs) libX11 libXext; - patchelf = patchelfNew; }; abiword = import ../applications/office/abiword {