cygwin: findutils fpending and coreutils patch
This commit is contained in:
parent
3f6949c3ef
commit
221b5a5be5
1259
pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch
Normal file
1259
pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch
Normal file
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,7 @@
|
||||||
{ stdenv, fetchurl, perl, gmp ? null
|
{ stdenv, fetchurl, perl, gmp ? null
|
||||||
, aclSupport ? false, acl ? null
|
, aclSupport ? false, acl ? null
|
||||||
, selinuxSupport? false, libselinux ? null, libsepol ? null
|
, selinuxSupport? false, libselinux ? null, libsepol ? null
|
||||||
|
, autoconf, automake114x
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert aclSupport -> acl != null;
|
assert aclSupport -> acl != null;
|
||||||
|
@ -18,6 +19,8 @@ let
|
||||||
sha256 = "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc";
|
sha256 = "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = if stdenv.isCygwin then [ ./coreutils-8.23-4.cygwin.patch ] else null;
|
||||||
|
|
||||||
# The test tends to fail on btrfs and maybe other unusual filesystems.
|
# The test tends to fail on btrfs and maybe other unusual filesystems.
|
||||||
postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
||||||
sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
|
sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
|
||||||
|
@ -26,6 +29,7 @@ let
|
||||||
nativeBuildInputs = [ perl ];
|
nativeBuildInputs = [ perl ];
|
||||||
buildInputs = [ gmp ]
|
buildInputs = [ gmp ]
|
||||||
++ optional aclSupport acl
|
++ optional aclSupport acl
|
||||||
|
++ optionals stdenv.isCygwin [ autoconf automake114x ] # due to patch
|
||||||
++ optionals selinuxSupport [ libselinux libsepol ];
|
++ optionals selinuxSupport [ libselinux libsepol ];
|
||||||
|
|
||||||
crossAttrs = {
|
crossAttrs = {
|
||||||
|
|
|
@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
|
||||||
configureFlags = [ "gl_cv_func_wcwidth_works=yes" ];
|
configureFlags = [ "gl_cv_func_wcwidth_works=yes" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
preConfigure = if stdenv.isCygwin then ''
|
||||||
|
sed -i gnulib/lib/fpending.h -e '/include <stdio_ext.h>/d'
|
||||||
|
'' else null;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/findutils/;
|
homepage = http://www.gnu.org/software/findutils/;
|
||||||
description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system";
|
description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system";
|
||||||
|
|
Loading…
Reference in a new issue