qt6Packages.qtkeychain: allow building with qt6
This commit is contained in:
parent
c0c84d5292
commit
22ed6b17d2
|
@ -1,11 +1,18 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qtbase, qttools
|
{ lib
|
||||||
, CoreFoundation, Security
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, qtbase
|
||||||
|
, qttools
|
||||||
|
, CoreFoundation
|
||||||
|
, Security
|
||||||
, libsecret
|
, libsecret
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "qtkeychain";
|
pname = "qtkeychain";
|
||||||
version = "0.12.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
|
version = "0.12.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "frankosterfeld";
|
owner = "frankosterfeld";
|
||||||
|
@ -18,7 +25,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [ ./0002-Fix-install-name-Darwin.patch ];
|
patches = [ ./0002-Fix-install-name-Darwin.patch ];
|
||||||
|
|
||||||
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
|
cmakeFlags = [
|
||||||
|
"-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}"
|
||||||
|
"-DQT_TRANSLATIONS_DIR=share/qt/translations"
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ]
|
nativeBuildInputs = [ cmake ]
|
||||||
++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret
|
++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret
|
||||||
|
@ -27,9 +37,22 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
|
buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
|
||||||
++ [ qtbase qttools ]
|
++ [ qtbase qttools ]
|
||||||
++ lib.optionals stdenv.isDarwin [
|
++ lib.optionals stdenv.isDarwin [
|
||||||
CoreFoundation Security
|
CoreFoundation
|
||||||
]
|
Security
|
||||||
;
|
];
|
||||||
|
|
||||||
|
doInstallCheck = true;
|
||||||
|
|
||||||
|
# we previously had a note in here saying to run this check manually, so we might as
|
||||||
|
# well do it automatically. It seems like a perfectly valid sanity check, but I
|
||||||
|
# have no idea *why* we might need it
|
||||||
|
installCheckPhase = ''
|
||||||
|
runHook preInstallCheck
|
||||||
|
|
||||||
|
grep --quiet -R 'set(PACKAGE_VERSION "${version}"' .
|
||||||
|
|
||||||
|
runHook postInstallCheck
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Platform-independent Qt API for storing passwords securely";
|
description = "Platform-independent Qt API for storing passwords securely";
|
||||||
|
|
|
@ -31,6 +31,10 @@ in
|
||||||
|
|
||||||
inherit (kdeFrameworks) kcoreaddons;
|
inherit (kdeFrameworks) kcoreaddons;
|
||||||
|
|
||||||
|
qtkeychain = callPackage ../development/libraries/qtkeychain {
|
||||||
|
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||||
|
};
|
||||||
|
|
||||||
qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };
|
qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };
|
||||||
|
|
||||||
quazip = callPackage ../development/libraries/quazip { };
|
quazip = callPackage ../development/libraries/quazip { };
|
||||||
|
|
Loading…
Reference in a new issue