From 252458b9c556a31c5c52f3e9ead169ef49e38d29 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 13 Apr 2022 11:37:59 -0400 Subject: [PATCH 1/2] libsForQt5.qca-qt5_2_3_2: init at 2.3.2 --- pkgs/development/libraries/qca-qt5/2.3.2.nix | 30 ++++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 3 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/qca-qt5/2.3.2.nix diff --git a/pkgs/development/libraries/qca-qt5/2.3.2.nix b/pkgs/development/libraries/qca-qt5/2.3.2.nix new file mode 100644 index 000000000000..098fbacc7ff5 --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/2.3.2.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: + +stdenv.mkDerivation rec { + pname = "qca-qt5"; + version = "2.3.2"; + + src = fetchurl { + url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; + sha256 = "sha256-RpdgAjfEvDqXnofSzIBiTyewYoDmNfXZDsfdTSqfYG0="; + }; + + 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; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 4b00b704d5fb..081fa0c85026 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -176,6 +176,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + # Until macOS SDK allows for Qt 5.15, darwin is limited to 2.3.2 + qca-qt5_2_3_2 = callPackage ../development/libraries/qca-qt5/2.3.2.nix { }; + qcoro = callPackage ../development/libraries/qcoro { }; qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; From fbeaf0e6128d4341dcc4a0f520b8360da9242981 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 13 Apr 2022 11:42:05 -0400 Subject: [PATCH 2/2] libsForQt5.qca-qt5: mark as broken on darwin --- pkgs/development/libraries/qca-qt5/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index d10ebbdd4b77..b85a3ad8c7a7 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -26,5 +26,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; platforms = with platforms; unix; + # until macOS SDK supports Qt 5.15, 2.3.2 is the highest version of qca-qt5 + # that works on darwin + broken = stdenv.isDarwin; }; }