diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qtkeychain')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qtkeychain/default.nix | 9 |
2 files changed, 5 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch b/nixpkgs/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch deleted file mode 100644 index 30d93cd7bf8b..000000000000 --- a/nixpkgs/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch +++ /dev/null @@ -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 - ) - diff --git a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix index e06667540719..1f9ffb373082 100644 --- a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix @@ -12,18 +12,19 @@ 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 ]; + # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qtbase` + sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; cmakeFlags = [ "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}" |