public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54612 from veprbl/pr/qtkeychain_cleanup

Browse Source 
qtkeychain: remove CMP0025 hack
This commit is contained in:
Silvan Mosberger 2019-01-27 20:23:21 +01:00 committed by GitHub
commit e06af14ce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/qtkeychain/default.nix
View File

@ -20,13 +20,7 @@ stdenv.mkDerivation rec {
patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ]; patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ];
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
++ stdenv.lib.optional stdenv.isDarwin [
# correctly detect the compiler
# for details see cmake --help-policy CMP0025
"-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
]
;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];