diff options
| author | Eric Merritt <eric@afiniate.com> | 2015-05-07 18:59:52 -0500 |
|---|---|---|
| committer | Eric Merritt <eric@afiniate.com> | 2015-05-08 22:29:41 -0500 |
| commit | 73f0339c3596728f0902579a99c9ec3dadc5bf78 (patch) | |
| tree | b858aa53683792860ce96acc3af0203a139df78d /pkgs/development/libraries/crypto++ | |
| parent | 356236832d197b02757c2296c963a295a102f1d7 (diff) | |
| download | nixpkgs-73f0339c3596728f0902579a99c9ec3dadc5bf78.tar nixpkgs-73f0339c3596728f0902579a99c9ec3dadc5bf78.tar.gz nixpkgs-73f0339c3596728f0902579a99c9ec3dadc5bf78.tar.bz2 nixpkgs-73f0339c3596728f0902579a99c9ec3dadc5bf78.tar.lz nixpkgs-73f0339c3596728f0902579a99c9ec3dadc5bf78.tar.xz nixpkgs-73f0339c3596728f0902579a99c9ec3dadc5bf78.tar.zst nixpkgs-73f0339c3596728f0902579a99c9ec3dadc5bf78.zip | |
crypto++: fix build issue on OSX (10.9.5 at least)
Diffstat (limited to 'pkgs/development/libraries/crypto++')
| -rw-r--r-- | pkgs/development/libraries/crypto++/GNUmakefile.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/crypto++/default.nix | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/development/libraries/crypto++/GNUmakefile.patch b/pkgs/development/libraries/crypto++/GNUmakefile.patch new file mode 100644 index 00000000000..48fdfe42048 --- /dev/null +++ b/pkgs/development/libraries/crypto++/GNUmakefile.patch @@ -0,0 +1,13 @@ +--- crypto++/GNUmakefile 2013-02-20 10:30:52.000000000 -0500 ++++ crypto++/GNUmakefile 2015-05-07 18:34:25.000000000 -0500 +@@ -87,8 +87,8 @@ + endif + + ifeq ($(UNAME),Darwin) +-AR = libtool +-ARFLAGS = -static -o ++AR = ar ++ARFLAGS = cru + CXX = c++ + IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932) + ifeq ($(IS_GCC2),1) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index cf22a775b14..053937f1c56 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw"; }; - patches = stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch; + patches = (stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch) + ++ (stdenv.lib.optional stdenv.isDarwin ./GNUmakefile.patch); buildInputs = [ unzip libtool ]; |