haskellPackages.xattr: fix build with attr-2.4.48 (see ##53716)

pSub · pSub · commit 57afc591b3ed · 2019-03-09T17:37:46.000+01:00
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1240,4 +1240,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
diff --git a/pkgs/development/haskell-modules/patches/xattr-fix-build.patch b/pkgs/development/haskell-modules/patches/xattr-fix-build.patch
@@ -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
