Merge pull request #71964 from arthurl/wt-PR

wt: Allow optional library harfbuzz to be overriden with null
2019-10-25 14:29:39 +02:00 · 2019-10-25 14:29:39 +02:00 · 48a22a0ff7
commit 48a22a0ff7
parent 9db9719ea2 d2282cc4a7
1 changed files with 2 additions and 1 deletions
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@ -28,13 +28,14 @@ let

      cmakeFlags = [
        "-DWT_CPP_11_MODE=-std=c++11"
-        "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
        "--no-warn-unused-cli"
      ]
      ++ stdenv.lib.optionals (graphicsmagick != null) [
        "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
        "-DGM_PREFIX=${graphicsmagick}"
      ]
+      ++ stdenv.lib.optional (harfbuzz != null)
+        "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
      ++ stdenv.lib.optional (libmysqlclient != null)
        "-DMYSQL_PREFIX=${libmysqlclient}";