Merge pull request #54612 from veprbl/pr/qtkeychain_cleanup

qtkeychain: remove CMP0025 hack
2019-01-27 20:23:21 +01:00
parent f98c3b27ac 467a23aaed
commit e06af14ce7
1 changed files with 1 additions and 7 deletions
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -20,13 +20,7 @@ stdenv.mkDerivation rec {

  patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ];

-  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"
-       ]
-   ;
+  cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];

  nativeBuildInputs = [ cmake ];