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

Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging

Browse Source 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
This commit is contained in:
Eelco Dolstra
2014-09-23 11:27:53 +02:00
parent c1cf0b7dd5 25b395bc8d
commit cd71f7a2e6
68 changed files with 640 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,8 @@ stdenv.mkDerivation (rec {
propagatedBuildInputs = [ libgpgerror ];
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-asm";
doCheck = stdenv.system != "i686-linux"; # "basic" test fails after stdenv+glibc-2.18
# For some reason the tests don't find `libgpg-error.so'.