lol

qca-qt5: build with Qt 5.5

+30 -3
+2 -2
pkgs/development/libraries/qca-qt5/default.nix
··· 1 - { stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }: 1 + { stdenv, fetchgit, cmake, openssl, pkgconfig, qtbase }: 2 2 3 3 let 4 4 rev = "088ff642fc2990871e3555e73c94c9287e7514a9"; ··· 13 13 sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8"; 14 14 }; 15 15 16 - buildInputs = [ openssl qt5.base ]; 16 + buildInputs = [ openssl qtbase ]; 17 17 nativeBuildInputs = [ cmake pkgconfig ]; 18 18 19 19 meta = with stdenv.lib; {
+25
pkgs/development/libraries/qca-qt5/old.nix
··· 1 + { stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }: 2 + 3 + let 4 + rev = "088ff642fc2990871e3555e73c94c9287e7514a9"; 5 + shortrev = builtins.substring 0 7 rev; 6 + in 7 + stdenv.mkDerivation rec { 8 + name = "qca-qt5-20150422-${shortrev}"; 9 + src = fetchgit { 10 + url = "git://anongit.kde.org/qca.git"; 11 + branchName = "qt5"; 12 + inherit rev; 13 + sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8"; 14 + }; 15 + 16 + buildInputs = [ openssl qt5.base ]; 17 + nativeBuildInputs = [ cmake pkgconfig ]; 18 + 19 + meta = with stdenv.lib; { 20 + description = "Qt 5 Cryptographic Architecture"; 21 + homepage = http://delta.affinix.com/qca; 22 + maintainers = with maintainers; [ ttuegel ]; 23 + license = licenses.lgpl21Plus; 24 + }; 25 + }
+3 -1
pkgs/top-level/all-packages.nix
··· 7856 7856 7857 7857 qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; 7858 7858 7859 - qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; 7859 + qca-qt5 = callPackage ../development/libraries/qca-qt5/old.nix { }; 7860 7860 7861 7861 qimageblitz = callPackage ../development/libraries/qimageblitz {}; 7862 7862 ··· 7913 7913 qt5Support = true; 7914 7914 suffix = "qt5"; 7915 7915 }; 7916 + 7917 + qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; 7916 7918 7917 7919 }; 7918 7920