alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Copy qca from kde-4.5 to make qca2_ossl build

Browse source 
svn path=/nixpkgs/trunk/; revision=23137
This commit is contained in:
Yury G. Kudryashov 2010-08-12 10:39:29 +00:00
parent 829f6c2108
commit 05da3db77f
3 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/kde-4.4/default.nix
View file

@ -32,11 +32,11 @@ pkgs.recurseIntoAttrs (rec {
}; };
qca2 = import ./support/qca2 { qca2 = import ./support/qca2 {
inherit (pkgs) stdenv fetchurl lib which qt4; inherit (pkgs) stdenv fetchurl which qt4;
}; };
qca2_ossl = import ./support/qca2/ossl.nix { qca2_ossl = import ./support/qca2/ossl.nix {
inherit (pkgs) stdenv fetchurl lib qt4 openssl; inherit (pkgs) stdenv fetchurl fetchsvn qt4 openssl;
inherit qca2; inherit qca2;
}; };

13
pkgs/desktops/kde-4.4/support/qca2/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, lib, which, qt4}: {stdenv, fetchurl, which, qt4}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "qca-2.0.2"; name = "qca-2.0.2";
@ -7,10 +7,17 @@ stdenv.mkDerivation {
sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8"; sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
}; };
buildInputs = [ which qt4 ]; buildInputs = [ which qt4 ];
meta = { 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'
'';
meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture"; description = "Qt Cryptographic Architecture";
license = "LGPL"; license = "LGPL";
homepage = http://delta.affinix.com/qca; homepage = http://delta.affinix.com/qca;
maintainers = [ lib.maintainers.sander ]; maintainers = [ maintainers.sander maintainers.urkud ];
}; };
} }

19
pkgs/desktops/kde-4.4/support/qca2/ossl.nix
View file

@ -1,23 +1,32 @@
{stdenv, fetchurl, lib, qt4, qca2, openssl}: {stdenv, fetchurl, fetchsvn, qt4, qca2, openssl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qca-ossl-2.0.0-beta3"; version = "2.0.0-beta3";
name = "qca-ossl-${version}";
src = fetchurl { src = fetchurl {
url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2"; url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2";
sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08"; sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08";
}; };
# SVN version has stabilized and has a lot of fixes for fresh OpenSSL
# Take the main source from there
svn_src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca/plugins/qca-ossl ;
rev = 1115936;
sha256 = "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b";
};
buildInputs = [ qt4 qca2 openssl ]; buildInputs = [ qt4 qca2 openssl ];
dontAddPrefix = true; dontAddPrefix = true;
configureFlags="--no-separate-debug-info --with-qca=${qca2} configureFlags="--no-separate-debug-info --with-qca=${qca2}
--with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
preConfigure='' preConfigure=''
cp ${svn_src}/qca-ossl.cpp .
configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins" configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
''; '';
patches = [ ./ossl-remove-whirlpool.patch ]; meta = with stdenv.lib; {
meta = {
description = "Qt Cryptographic Architecture OpenSSL plugin"; description = "Qt Cryptographic Architecture OpenSSL plugin";
license = "LGPL"; license = "LGPL";
homepage = http://delta.affinix.com/qca; homepage = http://delta.affinix.com/qca;
maintainers = [ lib.maintainers.urkud ]; maintainers = [ maintainers.urkud ];
}; };
} }