public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Aycan iRiCAN
2014-06-21 19:55:26 +03:00
parent 8fe08c34a4 3b267d77a8
commit a60e9fb33c
7 changed files with 88 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/ncurses/default.nix
View File

@@ -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

2
pkgs/development/libraries/zlib/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
# As zlib takes part in the stdenv building, we don't want references
# to the bootstrap-tools libgcc (as uses to happen on arm/mips)
NIX_CFLAGS_COMPILE = "-static-libgcc";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc";
crossAttrs = {
dontStrip = static;