diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:27:53 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:27:53 +0200 |
commit | cd71f7a2e660440cbcf634ba97eaae310084d11a (patch) | |
tree | a40196e3795a4f18ff8fcc9d0f93af0fc1afa3cb /pkgs/development/libraries/libgcrypt/default.nix | |
parent | c1cf0b7dd5fccb16c8c470d8c766a050fd7a4a36 (diff) | |
parent | 25b395bc8d8b1590723dc42edd97561611f8db68 (diff) | |
download | nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.gz nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.bz2 nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.lz nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.xz nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.zst nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.zip |
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
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
Diffstat (limited to 'pkgs/development/libraries/libgcrypt/default.nix')
-rw-r--r-- | pkgs/development/libraries/libgcrypt/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index b47709940dd..af231632022 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -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'. |