diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 0d4b5fd03fb..139d3ac8b1f 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, -zlib, patchelf05 }: +zlib }: /* I haven't found any x86_64 package from them */ assert stdenv.system == "i686-linux"; @@ -55,12 +55,12 @@ stdenv.mkDerivation { fullPath=$fullPath:$i/lib done - ${patchelf05}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath $fullPath \ $out/opt/googleearth/googleearth-bin for a in $out/opt/googleearth/*.so* ; do - ${patchelf05}/bin/patchelf --set-rpath $fullPath $a + patchelf --set-rpath $fullPath $a done ''; diff --git a/pkgs/development/tools/misc/patchelf/0.5.nix b/pkgs/development/tools/misc/patchelf/0.5.nix deleted file mode 100644 index a2b06d7f288..00000000000 --- a/pkgs/development/tools/misc/patchelf/0.5.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "patchelf-0.5pre15975"; - - src = fetchurl { - url = http://hydra.nixos.org/build/35275/download/1/patchelf-0.5pre15975.tar.bz2; - sha256 = "fa945392386c484b670c1182e354f0738b03db54d51ed6cc7ff9ebd645a20ecb"; - }; - - meta = { - homepage = http://nixos.org/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/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 91832cd45a7..43944ca9acd 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "patchelf-0.4"; +stdenv.mkDerivation rec { + name = "patchelf-0.5"; src = fetchurl { - url = http://nixos.org/releases/patchelf/patchelf-0.4/patchelf-0.4.tar.bz2; - sha256 = "65c455b62fc52292e2488f05f46e7e38c46fdcf69c002750f5887145284c4f85"; + url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; + sha256 = "24b9a850af45e1a277e234b9eb090b52305a2e1c6b02addeb3ae98b4b49d37ce"; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8be77814576..7a50590ba96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3023,10 +3023,6 @@ let inherit fetchurl stdenv; }); - patchelf05 = import ../development/tools/misc/patchelf/0.5.nix { - inherit fetchurl stdenv; - }; - pmccabe = import ../development/tools/misc/pmccabe { inherit fetchurl stdenv; }; @@ -7215,7 +7211,6 @@ let inherit stdenv fetchurl glibc mesa freetype zlib glib; inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes libXcursor libXinerama libXext libX11; - inherit patchelf05; }; gpsbabel = import ../applications/misc/gpsbabel {