Merge pull request #237566 from DeeUnderscore/update/qtkeychain-0.14.1

qtkeychain: 0.12.0 -> 0.14.1
This commit is contained in:
Ilan Joselevich 2023-06-13 23:55:48 +03:00 committed by GitHub
commit 8fcb368580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 15 deletions

View File

@ -1,10 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,6 @@
VERSION ${QTKEYCHAIN_VERSION}
SOVERSION ${QTKEYCHAIN_SOVERSION}
MACOSX_RPATH 1
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
INSTALL_RPATH_USE_LINK_PATH TRUE
)

View File

@ -12,19 +12,17 @@
stdenv.mkDerivation rec {
pname = "qtkeychain";
version = "0.12.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "frankosterfeld";
repo = "qtkeychain";
rev = "v${version}";
sha256 = "0gi1nx4bcc1vwfw41cif3xi2i59229vy0kc2r5959d8n6yv31kfr"; # v0.9.1
rev = "${version}";
sha256 = "sha256-LclYOuIYn+jYCvg69uHFlV3VcZ2KWdr8lFyCSBIB7Kw=";
};
dontWrapQtApps = true;
patches = [ ./0002-Fix-install-name-Darwin.patch ];
cmakeFlags = [
"-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}"
"-DQT_TRANSLATIONS_DIR=share/qt/translations"