diff options
| author | Roman Plášil <me@rplasil.name> | 2019-10-20 20:33:57 +0800 |
|---|---|---|
| committer | Roman Plášil <me@rplasil.name> | 2019-10-20 20:33:57 +0800 |
| commit | 12484979e850a5d05a9bcd99dea9c660e41e00ab (patch) | |
| tree | f5481d1621214c57abcc383890617615023f7ceb /pkgs/development/libraries/qtkeychain | |
| parent | dc2f24796eb709157240c09030cb8331086ffa08 (diff) | |
qtkeychain: fix install_name_dir on Darwin
Diffstat (limited to 'pkgs/development/libraries/qtkeychain')
| -rw-r--r-- | pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/qtkeychain/default.nix | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch b/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch new file mode 100644 index 000000000000..30d93cd7bf8b --- /dev/null +++ b/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch @@ -0,0 +1,10 @@ +--- 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/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 3de84d859111..4951670f8964 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 }; - patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ]; + patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []); cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; |