diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-01-15 13:28:35 -0500 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-01-24 11:37:56 -0500 |
| commit | eee7cafaf7961b762cb74edd1670b42e5a7547a9 (patch) | |
| tree | 9db346ec5a9469bdf4f3bf56643cc7f4613e9696 /pkgs/tools/misc/coreutils | |
| parent | bf17d6dacf2408436ffb5a2f8c87a31c88ec28e2 (diff) | |
| download | nixlib-eee7cafaf7961b762cb74edd1670b42e5a7547a9.tar nixlib-eee7cafaf7961b762cb74edd1670b42e5a7547a9.tar.gz nixlib-eee7cafaf7961b762cb74edd1670b42e5a7547a9.tar.bz2 nixlib-eee7cafaf7961b762cb74edd1670b42e5a7547a9.tar.lz nixlib-eee7cafaf7961b762cb74edd1670b42e5a7547a9.tar.xz nixlib-eee7cafaf7961b762cb74edd1670b42e5a7547a9.tar.zst nixlib-eee7cafaf7961b762cb74edd1670b42e5a7547a9.zip | |
coreutils: Use `buildPackages` instead of `self` hack for native version
Diffstat (limited to 'pkgs/tools/misc/coreutils')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9e66c6ba9181..b65c20e7808d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, xz, gmp ? null +{ lib, stdenv, buildPackages, fetchurl, perl, xz, gmp ? null , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null , selinuxSupport? false, libselinux ? null, libsepol ? null @@ -12,8 +12,7 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; -let - self = stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "coreutils-8.26"; src = fetchurl { @@ -63,12 +62,12 @@ let # Works around a bug with 8.26: # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. preInstall = '' - sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${self}/bin/install -c|' + sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|' ''; postInstall = '' rm $out/share/man/man1/* - cp ${self}/share/man/man1/* $out/share/man/man1 + cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 ''; # Needed for fstatfs() @@ -110,6 +109,4 @@ let maintainers = [ maintainers.eelco ]; }; - }; -in - self + } |