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

Merge branch 'master' into staging

Browse Source 
A few trivial conflicts due to *Platforms mass replace.
This commit is contained in:
Vladimír Čunát
2018-09-01 17:38:18 +02:00
parent 2e7cb61cfb 9a56eee0b1
commit 2d6179d1e8
678 changed files with 49966 additions and 51072 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/coreutils/default.nix
+12 -13
View File
@@ -1,6 +1,5 @@
{ stdenv, lib, buildPackages
, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
, hostPlatform, buildPlatform
, aclSupport ? stdenv.isLinux, acl ? null
, attrSupport ? stdenv.isLinux, attr ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null
@@ -24,10 +23,10 @@ stdenv.mkDerivation rec {
sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8";
};
patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
# The test tends to fail on btrfs and maybe other unusual filesystems.
postPatch = optionalString (!hostPlatform.isDarwin) ''
postPatch = optionalString (!stdenv.hostPlatform.isDarwin) ''
sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
@@ -45,9 +44,9 @@ stdenv.mkDerivation rec {
++ optional (singleBinary != false)
("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
++ optional withOpenssl "--with-openssl"
++ optional hostPlatform.isSunOS "ac_cv_func_inotify_init=no"
++ optional stdenv.hostPlatform.isSunOS "ac_cv_func_inotify_init=no"
++ optional withPrefix "--program-prefix=g"
++ optionals (hostPlatform != buildPlatform && hostPlatform.libc == "glibc") [
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc == "glibc") [
# TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I
# don't know why it is not properly detected cross building with glibc.
"fu_cv_sys_stat_statfs2_bsize=yes"
@@ -58,37 +57,37 @@ stdenv.mkDerivation rec {
++ optional aclSupport acl
++ optional attrSupport attr
++ optional withOpenssl openssl
++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch
++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch
++ optionals selinuxSupport [ libselinux libsepol ]
# TODO(@Ericson2314): Investigate whether Darwin could benefit too
++ optional (hostPlatform != buildPlatform && hostPlatform.libc != "glibc") libiconv;
++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
# The tests are known broken on Cygwin
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
# Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
# and {Open,Free}BSD.
# With non-standard storeDir: https://github.com/NixOS/nix/issues/512
doCheck = hostPlatform == buildPlatform
&& hostPlatform.libc == "glibc"
doCheck = stdenv.hostPlatform == stdenv.buildPlatform
&& stdenv.hostPlatform.libc == "glibc"
&& builtins.storeDir == "/nix/store";
# Prevents attempts of running 'help2man' on cross-built binaries.
PERL = if hostPlatform == buildPlatform then null else "missing";
PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";
# Saw random failures like ‘help2man: can't get '--help' info from
# man/sha512sum.td/sha512sum’.
enableParallelBuilding = false;
NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1";
FORCE_UNSAFE_CONFIGURE = optionalString stdenv.hostPlatform.isSunOS "1";
# Works around a bug with 8.26:
# Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop.
preInstall = optionalString (hostPlatform != buildPlatform) ''
preInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|'
'';
postInstall = optionalString (hostPlatform != buildPlatform && !minimal) ''
postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) ''
rm $out/share/man/man1/*
cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1
''