Merge pull request #57129 from NixOS/fix-haskellPackages-xattr

haskellPackages.xattr: fix build with attr-2.4.48 (see #53716)
This commit is contained in:
Pascal Wittmann 2019-03-15 09:08:41 +01:00 committed by GitHub
commit 66504c0671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions

View File

@ -1237,4 +1237,7 @@ self: super: {
};
}) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck]));
# Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -0,0 +1,16 @@
diff --git a/System/Xattr.hsc b/System/Xattr.hsc
index adaf9cb..9b49996 100644
--- a/System/Xattr.hsc
+++ b/System/Xattr.hsc
@@ -45,11 +45,7 @@ module System.Xattr
where
#include <sys/types.h>
-#ifdef __APPLE__
#include <sys/xattr.h>
-#else
-#include <attr/xattr.h>
-#endif
import Data.Functor ((<$>))
import Foreign.C