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

Merge pull request #7756 from ericbmerritt/fix-osx-crypto++

Browse Source 
This resolves crypto++ build problems on OSX
This commit is contained in:
Eric Seidel 2015-05-11 14:19:15 -07:00
commit 84e1c276e6
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/crypto++/GNUmakefile.patch Normal file
View File

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

3
pkgs/development/libraries/crypto++/default.nix
View File

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