diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-07 09:38:20 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-07 09:38:20 +0000 |
commit | c615cbae70061c0ab0ce5d433a3ff3eb19eb0180 (patch) | |
tree | ee27eb37453c430b8e67b4672e41d16f8c69315c /pkgs/development/libraries/crypto++/default.nix | |
parent | a810d44d8137e2af5fea2be00caecbd2fc9580ee (diff) | |
parent | a21457ffa899ee53a69651f563cdc035f6f15d19 (diff) | |
download | nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.gz nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.bz2 nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.lz nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.xz nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.zst nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32099
Diffstat (limited to 'pkgs/development/libraries/crypto++/default.nix')
-rw-r--r-- | pkgs/development/libraries/crypto++/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index d22eb738671e..138ee6eb27f5 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, unzip, libtool }: stdenv.mkDerivation rec { - name = "crypto++-5.6.0"; + name = "crypto++-5.6.1"; src = fetchurl { - url = "mirror://sourceforge/cryptopp/cryptopp560.zip"; - sha256 = "1icbk50mr1sqycqbxbqg703m8aamz23ajgl22ychxdahz2sz08mm"; + url = "mirror://sourceforge/cryptopp/cryptopp561.zip"; + sha256 = "0s7jhvnfihikqp1iwpdz03fad62xkjxci6jiahrh6f3sn664vrwq"; }; patches = [ ./pic.patch ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; cxxflags = if stdenv.isi686 then "-march=i686" else - if stdenv.isx86_64 then "-march=nocona" else + if stdenv.isx86_64 then "-march=nocona -fPIC" else ""; configurePhase = '' @@ -35,12 +35,10 @@ stdenv.mkDerivation rec { -e '/^CXXFLAGS =/s|-g -O2|-O3|' ''; - # Deal with one of the crappiest build system around there. + # I add what 'enableParallelBuilding' would add to the make call, + # if we were using the generic build phase. buildPhase = '' - # These guys forgot a file or something. - : > modexppc.cpp - - make PREFIX="$out" all cryptopp.dll + make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run @@ -48,11 +46,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir "$out" make install PREFIX="$out" - cp -v cryptopp.dll "$out/lib/libcryptopp.so" ''; doCheck = true; - checkPhase = "make test"; + checkPhase = "LD_LIBRARY_PATH=`pwd` make test"; meta = { description = "Crypto++, a free C++ class library of cryptographic schemes"; |