BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #71642 from Quiark/qtkeychain

Browse source 
qtkeychain: fix install_name_dir on Darwin
This commit is contained in:
Matthew Bauer 2019-11-07 16:52:33 -05:00 committed by GitHub
commit f1af1cb852
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch Normal file
View file

@ -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
)

2
pkgs/development/libraries/qtkeychain/default.nix
View file

@ -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" ];