Author: simons
Date: Mon Apr 2 18:18:31 2012
New Revision: 33541
URL: https://nixos.org/websvn/nix/?rev=33541&sc=1
Log:
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.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
Mon Apr 2 17:31:08 2012 (r33540)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix
Mon Apr 2 18:18:31 2012 (r33541)
@@ -44,14 +44,6 @@
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 = {
homepage = http://www.gnu.org/software/coreutils/;
description = "The basic file, shell and text manipulation utilities of
the GNU operating system";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits