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

More explicit dependencies

Browse Source 
svn path=/nixpkgs/trunk/; revision=26052
This commit is contained in:
Yury G. Kudryashov 2011-02-22 09:52:54 +00:00
parent 513947cf9f
commit 75f4d9972d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/kde-4.6/support/qca2/default.nix
View File

@ -6,7 +6,8 @@ stdenv.mkDerivation {
url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2; url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2;
sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8"; sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
}; };
buildInputs = [ which qt4 ]; buildInputs = [ qt4 ];
buildNativeInputs = [ which ];
preBuild = '' preBuild = ''
sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\ sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\

3
pkgs/desktops/kde-4.6/support/qca2/ossl.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl}: {stdenv, fetchurl, fetchsvn, qt4, qca2, openssl, which}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.0.0-beta3"; version = "2.0.0-beta3";
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b"; sha256 = "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b";
}; };
buildInputs = [ qt4 qca2 openssl ]; buildInputs = [ qt4 qca2 openssl ];
buildNativeInputs = [ which ];
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";