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

Crypto++: Fix on Darwin.

Browse Source 
svn path=/nixpkgs/trunk/; revision=17196
This commit is contained in:
Ludovic Courtès 2009-09-16 14:35:38 +00:00
parent 26bf0b0150
commit bdc8e21d9e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ fetchurl, stdenv, unzip }: { fetchurl, stdenv, unzip, libtool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "crypto++-5.6.0"; name = "crypto++-5.6.0";
@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (builtins.currentSystem != "i686-cygwin") ./dll.patch; ++ stdenv.lib.optional (builtins.currentSystem != "i686-cygwin") ./dll.patch;
buildInputs = [ unzip ]; buildInputs = [ unzip ]
# For some reason the makefile sets "AR = libtool" on Darwin.
++ stdenv.lib.optional (builtins.currentSystem == "i686-darwin") libtool;
# Unpack the thing in a subdirectory. # Unpack the thing in a subdirectory.
unpackPhase = '' unpackPhase = ''

2
pkgs/top-level/all-packages.nix
View File

@ -2982,7 +2982,7 @@ let
}; };
cryptopp = import ../development/libraries/crypto++ { cryptopp = import ../development/libraries/crypto++ {
inherit fetchurl stdenv unzip; inherit fetchurl stdenv unzip libtool;
}; };
cyrus_sasl = import ../development/libraries/cyrus-sasl { cyrus_sasl = import ../development/libraries/cyrus-sasl {