diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-19 17:15:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-19 17:15:47 +0000 |
| commit | 4e65c8aa2a68fdafa2e5ce134d25eb54a0736d93 (patch) | |
| tree | 177ab54c25be9d06ecdf0ff039fb3402311ee1ac /pkgs/applications/misc/googleearth | |
| parent | 8cd183f062397f502e0dbd33a26f67049a8c1c68 (diff) | |
| download | nixpkgs-4e65c8aa2a68fdafa2e5ce134d25eb54a0736d93.tar nixpkgs-4e65c8aa2a68fdafa2e5ce134d25eb54a0736d93.tar.gz nixpkgs-4e65c8aa2a68fdafa2e5ce134d25eb54a0736d93.tar.bz2 nixpkgs-4e65c8aa2a68fdafa2e5ce134d25eb54a0736d93.tar.lz nixpkgs-4e65c8aa2a68fdafa2e5ce134d25eb54a0736d93.tar.xz nixpkgs-4e65c8aa2a68fdafa2e5ce134d25eb54a0736d93.tar.zst nixpkgs-4e65c8aa2a68fdafa2e5ce134d25eb54a0736d93.zip | |
* Use patchelf 0.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19548
Diffstat (limited to 'pkgs/applications/misc/googleearth')
| -rw-r--r-- | pkgs/applications/misc/googleearth/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
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 ''; |