summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2014-06-21 09:20:05 -0700
committerJohn Wiegley <johnw@newartisans.com>2014-06-21 09:20:05 -0700
commita9868357181a9e8c186d3f6e8c1dd860814586ee (patch)
tree2ddb9ef2955ab672b03b08de9bc4d7b47ccfb535
parent820052eb2c6eda39111e16f7f374a0da85cdb9bc (diff)
parentf39471a87314e5a6a67c15b3831acbc090f999fb (diff)
downloadnixlib-a9868357181a9e8c186d3f6e8c1dd860814586ee.tar
nixlib-a9868357181a9e8c186d3f6e8c1dd860814586ee.tar.gz
nixlib-a9868357181a9e8c186d3f6e8c1dd860814586ee.tar.bz2
nixlib-a9868357181a9e8c186d3f6e8c1dd860814586ee.tar.lz
nixlib-a9868357181a9e8c186d3f6e8c1dd860814586ee.tar.xz
nixlib-a9868357181a9e8c186d3f6e8c1dd860814586ee.tar.zst
nixlib-a9868357181a9e8c186d3f6e8c1dd860814586ee.zip
Merge pull request #2986 from jwiegley/ncurses
ncurses: apply a patch on Darwin for a clang bug
-rw-r--r--pkgs/development/libraries/ncurses/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 993993cecd07..7b502822a180 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -18,7 +18,13 @@ stdenv.mkDerivation (rec {
     sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
   };
 
-  patches = [ ./patch-ac ];
+  clangPatch = fetchurl {
+    # Patch referenced from https://github.com/Homebrew/homebrew-dupes/issues/43
+    url = "http://lists.gnu.org/archive/html/bug-ncurses/2011-04/txtkWQqiQvcZe.txt";
+    sha256 = "03lrwqvb0r2qgi8hz7ayd3g26d6xilr3c92j8li3b77kdc0w0rlv";
+  };
+
+  patches = [ ./patch-ac ] ++ stdenv.lib.optional stdenv.isDarwin clangPatch;
 
   configureFlags = ''
     --with-shared --without-debug --enable-pc-files --enable-symlinks