From 57afc591b3eddc6a618357c217932bb2861ee4bd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 9 Mar 2019 17:37:46 +0100 Subject: [PATCH] haskellPackages.xattr: fix build with attr-2.4.48 (see ##53716) --- .../haskell-modules/configuration-common.nix | 3 +++ .../patches/xattr-fix-build.patch | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/xattr-fix-build.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index de3c875cbbf3..e2bd088583a6 100644 --- 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 new file mode 100644 index 000000000000..4b4f370b17f2 --- /dev/null +++ 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 +-#ifdef __APPLE__ + #include +-#else +-#include +-#endif + + import Data.Functor ((<$>)) + import Foreign.C