Reverted the patchelf modification to coreutils.
It's not obvious to me why that change is needed (and it would need further work to generalize to non-Linux platforms, too). Thanks to Eelco for catching this. svn path=/nixpkgs/branches/stdenv-updates/; revision=33541
This commit is contained in:
parent
00cd8c4235
commit
916b7d9dff
@ -44,14 +44,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol";
|
NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol";
|
||||||
|
|
||||||
# the coreutils install calls the ginstall just compiled, before we have
|
|
||||||
# a chance to patchelf it.
|
|
||||||
libPath = stdenv.lib.makeLibraryPath ([stdenv.gcc.libc] ++ buildInputs);
|
|
||||||
|
|
||||||
preInstall = ''
|
|
||||||
patchelf --set-rpath $libPath src/ginstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/coreutils/;
|
homepage = http://www.gnu.org/software/coreutils/;
|
||||||
description = "The basic file, shell and text manipulation utilities of the GNU operating system";
|
description = "The basic file, shell and text manipulation utilities of the GNU operating system";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user