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

crypto++: use stdenv.system in stead of builtins.currentSystem for patches and buildinputs

Browse Source 
svn path=/nixpkgs/trunk/; revision=22507
This commit is contained in:
Rob Vermaas 2010-07-07 11:44:58 +00:00
parent 78ba3b5d01
commit 0bb5538ec7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,13 +9,13 @@ stdenv.mkDerivation rec {
}; };
patches = [ ./pic.patch ] patches = [ ./pic.patch ]
++ stdenv.lib.optional (builtins.currentSystem != "i686-cygwin") ./dll.patch; ++ stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch;
buildInputs = [ unzip ] buildInputs = [ unzip ]
# For some reason the makefile sets "AR = libtool" on Darwin. # For some reason the makefile sets "AR = libtool" on Darwin.
++ stdenv.lib.optional (builtins.currentSystem == "i686-darwin") libtool; ++ stdenv.lib.optional (stdenv.system == "i686-darwin") libtool;
# Unpack the thing in a subdirectory. # Unpack the thing in a subdirectory.
unpackPhase = '' unpackPhase = ''