Unverified Commit 8fcb3685 authored by Ilan Joselevich's avatar Ilan Joselevich Committed by GitHub
Browse files

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

qtkeychain: 0.12.0 -> 0.14.1
parents 6a94d666 e39994d2

pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
--- 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

 )

pkgs/development/libraries/qtkeychain/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -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"