pyrox.dev / nixpkgs
lol
fork atom

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

qtkeychain: 0.12.0 -> 0.14.1

authored by

Ilan Joselevich and committed by
GitHub 8fcb3685 6a94d666

+3 -15
unified split
-10
pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch
··· 1 - --- a/CMakeLists.txt 2 - +++ b/CMakeLists.txt 3 - @@ -215,7 +215,6 @@ 4 - VERSION ${QTKEYCHAIN_VERSION} 5 - SOVERSION ${QTKEYCHAIN_SOVERSION} 6 - MACOSX_RPATH 1 7 - - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" 8 - INSTALL_RPATH_USE_LINK_PATH TRUE 9 - ) 10 -
+3 -5
pkgs/development/libraries/qtkeychain/default.nix
··· 12 12 13 13 stdenv.mkDerivation rec { 14 14 pname = "qtkeychain"; 15 - version = "0.12.0"; 15 + version = "0.14.1"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "frankosterfeld"; 19 19 repo = "qtkeychain"; 20 - rev = "v${version}"; 21 - sha256 = "0gi1nx4bcc1vwfw41cif3xi2i59229vy0kc2r5959d8n6yv31kfr"; # v0.9.1 20 + rev = "${version}"; 21 + sha256 = "sha256-LclYOuIYn+jYCvg69uHFlV3VcZ2KWdr8lFyCSBIB7Kw="; 22 22 }; 23 23 24 24 dontWrapQtApps = true; 25 - 26 - patches = [ ./0002-Fix-install-name-Darwin.patch ]; 27 25 28 26 cmakeFlags = [ 29 27 "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}"