diff options
author | Nick Cao <nickcao@nichi.co> | 2023-10-10 22:42:22 -0400 |
---|---|---|
committer | Nick Cao <nickcao@nichi.co> | 2023-10-12 09:30:52 -0400 |
commit | ac20d172c41372d2fbd6560eacaf8caeba5cfc50 (patch) | |
tree | 24044ac6dac2fc60abb56e2d119241774df1c08a /pkgs | |
parent | 3a567fc49c1bf12eadad31ce55b0a091f9a3e3dc (diff) |
zeal: add patch for qt 6.6 support
Diffstat (limited to 'pkgs')
-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 7d8adf6cc018a..462b06054f3fb 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 ""' |