summary refs log tree commit diff
path: root/pkgs/tools/misc/coreutils
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2016-02-20 19:10:23 +0200
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2016-02-20 19:36:21 +0200
commit8bfc5d7e724da7d9642b7b20f8634727280ec9a4 (patch)
treeb0317651efa8b4c7cad64fc0c1c64ca14ec46df0 /pkgs/tools/misc/coreutils
parentd71a4851e8a2ef52f6d806d65822290cdbae8804 (diff)
downloadnixlib-8bfc5d7e724da7d9642b7b20f8634727280ec9a4.tar
nixlib-8bfc5d7e724da7d9642b7b20f8634727280ec9a4.tar.gz
nixlib-8bfc5d7e724da7d9642b7b20f8634727280ec9a4.tar.bz2
nixlib-8bfc5d7e724da7d9642b7b20f8634727280ec9a4.tar.lz
nixlib-8bfc5d7e724da7d9642b7b20f8634727280ec9a4.tar.xz
nixlib-8bfc5d7e724da7d9642b7b20f8634727280ec9a4.tar.zst
nixlib-8bfc5d7e724da7d9642b7b20f8634727280ec9a4.zip
coreutils: Remove ARM patch (coreutils-tail-inotify-race.patch)
The patch no longer applies as it's applied in the 8.25 release.

While at it don't use FORCE_UNSAFE_CONFIGURE on ARM as I don't see why
it's needed and it works for me without it.

Build-tested GNU hello on ARMv7 and verified that this affect its hash
on i686.
Diffstat (limited to 'pkgs/tools/misc/coreutils')
-rw-r--r--pkgs/tools/misc/coreutils/default.nix17
1 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 78c272916485..3bd5a9cbc589 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -19,24 +19,13 @@ let
       sha256 = "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii";
     };
 
-    patches =
-      lib.optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch
-      ++ lib.optional stdenv.isArm
-        (fetchurl {
-          url = "http://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0";
-          sha256 = "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz";
-          name = "coreutils-tail-inotify-race.patch";
-        });
+    patches = optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch;
 
     # The test tends to fail on btrfs and maybe other unusual filesystems.
     postPatch = optionalString (!stdenv.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
-    '' +
-       # This is required by coreutils-tail-inotify-race.patch to avoid more deps
-       optionalString stdenv.isArm ''
-         touch -r src/stat.c src/tail.c
-       '';
+    '';
 
     configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no";
 
@@ -84,7 +73,7 @@ let
     enableParallelBuilding = false;
 
     NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
-    FORCE_UNSAFE_CONFIGURE = optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1";
+    FORCE_UNSAFE_CONFIGURE = optionalString stdenv.isSunOS "1";
 
     makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";