diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/development/libraries/qtkeychain | |
parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qtkeychain')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/qtkeychain/default.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix index 2b3c88d58860..2e5371e285bc 100644 --- a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix +++ b/nixpkgs/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 ]; |