about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-12-03 08:32:59 -0600
committerGitHub <noreply@github.com>2018-12-03 08:32:59 -0600
commitf1a111bbc5d85825d1afb1a09487b0447e8d4a7d (patch)
tree68d72f12178601ad7feab738f59765055660f923
parent4112aec98c04efbc0773ad04dfac84683121c9ec (diff)
parent26de2d17809fffa91d433316037433d457828632 (diff)
downloadnixlib-f1a111bbc5d85825d1afb1a09487b0447e8d4a7d.tar
nixlib-f1a111bbc5d85825d1afb1a09487b0447e8d4a7d.tar.gz
nixlib-f1a111bbc5d85825d1afb1a09487b0447e8d4a7d.tar.bz2
nixlib-f1a111bbc5d85825d1afb1a09487b0447e8d4a7d.tar.lz
nixlib-f1a111bbc5d85825d1afb1a09487b0447e8d4a7d.tar.xz
nixlib-f1a111bbc5d85825d1afb1a09487b0447e8d4a7d.tar.zst
nixlib-f1a111bbc5d85825d1afb1a09487b0447e8d4a7d.zip
Merge pull request #51408 from matthewbauer/disable-subsecond-gnumake
gnumake: disable subsecond mtime on darwin
-rw-r--r--pkgs/development/tools/build-managers/gnumake/4.2/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 98804f0ebe89..47f800c67be5 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -27,7 +27,16 @@ stdenv.mkDerivation {
   nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
   buildInputs = stdenv.lib.optionals guileSupport [ guile ];
 
-  configureFlags = stdenv.lib.optional guileSupport "--with-guile";
+  configureFlags = stdenv.lib.optional guileSupport "--with-guile"
+
+    # Make uses this test to decide whether it should keep track of
+    # subseconds. Apple made this possible with APFS and macOS 10.13.
+    # However, we still support macOS 10.11 and 10.12. Binaries built
+    # in Nixpkgs will be unable to use futimens to set mtime less than
+    # a second. So, tell Make to ignore nanoseconds in mtime here by
+    # overriding the autoconf test for the struct.
+    # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
+    ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
 
   outputs = [ "out" "man" "info" ];