diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index d0bcb73151f0..cabe672d7bc5 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }: +{ stdenv, fetchgit, cmake, openssl, pkgconfig, qtbase }: let rev = "088ff642fc2990871e3555e73c94c9287e7514a9"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8"; }; - buildInputs = [ openssl qt5.base ]; + buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qca-qt5/old.nix b/pkgs/development/libraries/qca-qt5/old.nix new file mode 100644 index 000000000000..d0bcb73151f0 --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/old.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73bda023df5..eb66abbcadd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7856,7 +7856,7 @@ let 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 {}; @@ -7914,6 +7914,8 @@ let suffix = "qt5"; }; + qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + }; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun;