public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Use patchelf 0.5.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19548
This commit is contained in:
Eelco Dolstra 2010-01-19 17:15:47 +00:00
parent 8cd183f062
commit 4e65c8aa2a
4 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/googleearth/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv, { stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv,
libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11,
zlib, patchelf05 }: zlib }:
/* I haven't found any x86_64 package from them */ /* I haven't found any x86_64 package from them */
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
@ -55,12 +55,12 @@ stdenv.mkDerivation {
fullPath=$fullPath:$i/lib fullPath=$fullPath:$i/lib
done done
${patchelf05}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $fullPath \ --set-rpath $fullPath \
$out/opt/googleearth/googleearth-bin $out/opt/googleearth/googleearth-bin
for a in $out/opt/googleearth/*.so* ; do for a in $out/opt/googleearth/*.so* ; do
${patchelf05}/bin/patchelf --set-rpath $fullPath $a patchelf --set-rpath $fullPath $a
done done
''; '';

16
pkgs/development/tools/misc/patchelf/0.5.nix
View File

@ -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";
};
}

8
pkgs/development/tools/misc/patchelf/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "patchelf-0.4"; name = "patchelf-0.5";
src = fetchurl { src = fetchurl {
url = http://nixos.org/releases/patchelf/patchelf-0.4/patchelf-0.4.tar.bz2; url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
sha256 = "65c455b62fc52292e2488f05f46e7e38c46fdcf69c002750f5887145284c4f85"; sha256 = "24b9a850af45e1a277e234b9eb090b52305a2e1c6b02addeb3ae98b4b49d37ce";
}; };
meta = { meta = {

5
pkgs/top-level/all-packages.nix
View File

@ -3023,10 +3023,6 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
patchelf05 = import ../development/tools/misc/patchelf/0.5.nix {
inherit fetchurl stdenv;
};
pmccabe = import ../development/tools/misc/pmccabe { pmccabe = import ../development/tools/misc/pmccabe {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -7215,7 +7211,6 @@ let
inherit stdenv fetchurl glibc mesa freetype zlib glib; inherit stdenv fetchurl glibc mesa freetype zlib glib;
inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes
libXcursor libXinerama libXext libX11; libXcursor libXinerama libXext libX11;
inherit patchelf05;
}; };
gpsbabel = import ../applications/misc/gpsbabel { gpsbabel = import ../applications/misc/gpsbabel {