diff options
author | Nick Cao <nickcao@nichi.co> | 2023-10-13 00:39:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-13 00:39:56 -0400 |
commit | 9cbf22c3f42fc91e1cb744a275da414ffd3589af (patch) | |
tree | dbd1f3b2dccff8611813e5ca069fd57ecb2716b9 /pkgs/data | |
parent | 7ba31c7a91e430e22bd1596f9b4dd277c543ed4e (diff) | |
parent | 2de11a7688a9c5eec0b8413cb00e8307a7fea02c (diff) | |
download | nixlib-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar nixlib-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.gz nixlib-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.bz2 nixlib-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.lz nixlib-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.xz nixlib-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.zst nixlib-9cbf22c3f42fc91e1cb744a275da414ffd3589af.zip |
Merge pull request #260239 from NickCao/qt6
qt6: 6.5.3 -> 6.6.0
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7d8adf6cc018..462b06054f3f 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , cmake , extra-cmake-modules , pkg-config @@ -30,6 +31,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-s1FaazHVtWE697BO0hIOgZVowdkq68R9x327ZnJRnlo="; }; + patches = [ + # fix build with qt 6.6.0 + # treewide: replace deprecated qAsConst with std::as_const() + # https://github.com/zealdocs/zeal/pull/1565 + (fetchpatch2 { + url = "https://github.com/zealdocs/zeal/commit/d50a0115d58df2b222ede4c3a76b9686f4716465.patch"; + hash = "sha256-Ub6RCZGpLSOjvK17Jrm+meZuZGXcC4kI3QYl5HbsLWU="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'ZEAL_VERSION_SUFFIX "-dev"' 'ZEAL_VERSION_SUFFIX ""' |