From 9c5ae0023685def0f241cee57e01494c4947d6de Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 20 Apr 2023 09:48:44 +0800 Subject: [PATCH] qt6Packages.qxlsx: 1.4.5 -> 1.4.6 Diff: https://github.com/QtExcel/QXlsx/compare/v1.4.5...v1.4.6 --- pkgs/development/libraries/qxlsx/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix index 6251689d0e23..b6d92b964452 100644 --- a/pkgs/development/libraries/qxlsx/default.nix +++ b/pkgs/development/libraries/qxlsx/default.nix @@ -1,21 +1,31 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , qtbase }: stdenv.mkDerivation rec { pname = "qxlsx"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "QtExcel"; repo = "QXlsx"; rev = "v${version}"; - hash = "sha256-T+PUeml4O6uwY6DCAsBer4gDo+nrSGGus+yQv02CJcE="; + hash = "sha256-8plnvyb4sQRfEac1TVWgr2yrtAVAPKucgAnsybdUd3U="; }; + patches = [ + # Fix header include path + # https://github.com/QtExcel/QXlsx/pull/279 + (fetchpatch { + url = "https://github.com/QtExcel/QXlsx/commit/9d6db9efb92b93c3663ccfef3aec05267ba43723.patch"; + hash = "sha256-EbE5CNACAcgENCQh81lBZJ52hCIcBsFhNnYOS0Wr25I="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase ];