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

qca-qt5: build with Qt 5.5

Browse Source
This commit is contained in:
Thomas Tuegel 2015-09-27 10:00:13 -05:00
parent 60000c87ae
commit 943c2bf059
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qca-qt5/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }: { stdenv, fetchgit, cmake, openssl, pkgconfig, qtbase }:
let let
rev = "088ff642fc2990871e3555e73c94c9287e7514a9"; rev = "088ff642fc2990871e3555e73c94c9287e7514a9";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8"; sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8";
}; };
buildInputs = [ openssl qt5.base ]; buildInputs = [ openssl qtbase ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

25
pkgs/development/libraries/qca-qt5/old.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }:
let
rev = "088ff642fc2990871e3555e73c94c9287e7514a9";
shortrev = builtins.substring 0 7 rev;
in
stdenv.mkDerivation rec {
name = "qca-qt5-20150422-${shortrev}";
src = fetchgit {
url = "git://anongit.kde.org/qca.git";
branchName = "qt5";
inherit rev;
sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8";
};
buildInputs = [ openssl qt5.base ];
nativeBuildInputs = [ cmake pkgconfig ];
meta = with stdenv.lib; {
description = "Qt 5 Cryptographic Architecture";
homepage = http://delta.affinix.com/qca;
maintainers = with maintainers; [ ttuegel ];
license = licenses.lgpl21Plus;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -7856,7 +7856,7 @@ let
qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; qca-qt5 = callPackage ../development/libraries/qca-qt5/old.nix { };
qimageblitz = callPackage ../development/libraries/qimageblitz {}; qimageblitz = callPackage ../development/libraries/qimageblitz {};
@ -7914,6 +7914,8 @@ let
suffix = "qt5"; suffix = "qt5";
}; };
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
}; };
qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun;