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:
commit
66504c0671
@ -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
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user