qca2: Update to new upstream version 2.1.0.
This also removes qca2_ossl, because it's now bundled with the main QCA package and we can now drop all those patches and build system fixes, because they have switched from autotools to cmake. Tested against a few builds like PSI and Tomahawk. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
@@ -1,32 +1,18 @@
|
||||
{ stdenv, fetchurl, which, qt4 }:
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, qt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qca-2.0.3";
|
||||
|
||||
name = "qca-2.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.bz2";
|
||||
sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld";
|
||||
url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.gz";
|
||||
sha256 = "114jg97fmg1rb4llfg7x7r68lxdkjrx60qsqq76khdwc2dvcsv92";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
|
||||
preBuild =
|
||||
''
|
||||
sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
|
||||
EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
|
||||
EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
|
||||
EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
|
||||
EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
|
||||
'';
|
||||
|
||||
patches = [ ./gcc47.patch ];
|
||||
|
||||
configureFlags = "--no-separate-debug-info";
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ qt ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Qt Cryptographic Architecture";
|
||||
license = "LGPL";
|
||||
|
||||
Reference in New Issue
Block a user