diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:21 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:48 +0100 |
| commit | 048a4cd441a59cbf89defb18bb45c9f0b4429b35 (patch) | |
| tree | f8f5850ff05521ab82d65745894714a8796cbfb6 /pkgs/data/documentation/zeal/default.nix | |
| parent | 030c5028b07afcedce7c5956015c629486cc79d9 (diff) | |
| parent | 4c2d05dd6435d449a3651a6dd314d9411b5f8146 (diff) | |
| download | nixpkgs-rootfs.tar nixpkgs-rootfs.tar.gz nixpkgs-rootfs.tar.bz2 nixpkgs-rootfs.tar.lz nixpkgs-rootfs.tar.xz nixpkgs-rootfs.tar.zst nixpkgs-rootfs.zip | |
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/data/documentation/zeal/default.nix')
| -rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7d8adf6cc01..18f4d131973 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 ""' @@ -62,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://zealdocs.org/"; changelog = "https://github.com/zealdocs/zeal/releases"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ skeidel peterhoeg AndersonTorres ]; + maintainers = with lib.maintainers; [ peterhoeg AndersonTorres ]; inherit (qtbase.meta) platforms; }; }) |