qca: rename from qca-qt5, add Qt6 support
This commit is contained in:
parent
e9eb9f97f3
commit
8cf720ba33
|
@ -1,30 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qca-qt5";
|
||||
version = "2.3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
|
||||
sha256 = "sha256-7lnVMdS4L7FoX02NdMLKoHd/UBgA90JuqjchCaQwUkk=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl qtbase ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# tells CMake to use this CA bundle file if it is accessible
|
||||
preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt";
|
||||
|
||||
# tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
|
||||
cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt 5 Cryptographic Architecture";
|
||||
homepage = "http://delta.affinix.com/qca";
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
35
pkgs/development/libraries/qca/default.nix
Normal file
35
pkgs/development/libraries/qca/default.nix
Normal file
|
@ -0,0 +1,35 @@
|
|||
{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase, qt5compat ? null }:
|
||||
|
||||
let
|
||||
isQt6 = lib.versions.major qtbase.version == "6";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "qca";
|
||||
version = "2.3.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/qca/${version}/qca-${version}.tar.xz";
|
||||
sha256 = "sha256-/uI0O1RofVvj4w+zPOKW7lCseuXiPXq3JfY//fevP0M=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl qtbase qt5compat ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# tells CMake to use this CA bundle file if it is accessible
|
||||
preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt";
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "QT6" isQt6)
|
||||
# tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
|
||||
"-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt Cryptographic Architecture";
|
||||
homepage = "https://invent.kde.org/libraries/qca";
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
|
@ -192,10 +192,11 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
|
|||
|
||||
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
|
||||
|
||||
qca-qt5 = callPackage ../development/libraries/qca-qt5 {
|
||||
qca = callPackage ../development/libraries/qca {
|
||||
stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv;
|
||||
inherit (libsForQt5) qtbase;
|
||||
};
|
||||
qca-qt5 = self.qca;
|
||||
|
||||
qcoro = callPackage ../development/libraries/qcoro { };
|
||||
|
||||
|
|
|
@ -31,6 +31,10 @@ makeScopeWithSplicing' {
|
|||
# LIBRARIES
|
||||
kdsoap = callPackage ../development/libraries/kdsoap { };
|
||||
|
||||
qca = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/qca {
|
||||
inherit (qt6) qtbase qt5compat;
|
||||
};
|
||||
|
||||
qt6ct = callPackage ../tools/misc/qt6ct { };
|
||||
|
||||
qt6gtk2 = callPackage ../tools/misc/qt6gtk2 { };
|
||||
|
|
Loading…
Reference in New Issue
Block a user