From 5c5fc136028a0cac83397f8b58ae3096074b2e34 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 9 Sep 2019 15:23:42 +0200 Subject: [PATCH 1/2] wt3: 3.4.0 -> 3.4.1, include harfbuzz --- pkgs/development/libraries/wt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 958257ffe76d7..d38e191080ee6 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu , pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl -, pcre +, pcre, harfbuzz }: let @@ -31,6 +31,7 @@ let "-DWT_CPP_11_MODE=-std=c++11" "-DGM_PREFIX=${graphicsmagick}" "-DMYSQL_PREFIX=${mysql.connector-c}" + "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include" "--no-warn-unused-cli" ]; @@ -44,8 +45,8 @@ let }; in { wt3 = generic { - version = "3.4.0"; - sha256 = "0y0b2h9jf5cg1gdh48dj32pj5nsvipab1cgygncxf98c46ikhysg"; + version = "3.4.1"; + sha256 = "1bsx7hmy6g2x9p3vl5xw9lv1xk891pnvs93a87s15g257gznkjmj"; }; wt4 = generic { From 823e8accb945ab449c082c179e6ca755439c9c59 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 9 Sep 2019 15:26:22 +0200 Subject: [PATCH 2/2] wt4: 4.1.0 -> 4.1.1 --- pkgs/development/libraries/wt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index d38e191080ee6..319b0effc5788 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -50,7 +50,7 @@ in { }; wt4 = generic { - version = "4.1.0"; - sha256 = "1a9nl5gs8m8pssf2l3z6kbl2rc9fw5ad7lfslw5yr3gzi0zqn05x"; + version = "4.1.1"; + sha256 = "1f1imx5kbpqlysrqx5h75hf2f8pkq972rz42x0pl6cxbnsyzngid"; }; }