diff options
| author | Tobias Mayer <tobim@fastmail.fm> | 2023-08-27 08:01:08 +0200 |
|---|---|---|
| committer | Tobias Mayer <tobim@fastmail.fm> | 2023-09-04 21:01:48 +0200 |
| commit | 05a33a501552095d3fb0fcd9f5ce4506fa9c8ad4 (patch) | |
| tree | 6fc5fc5ec58050b4f45edb262e1d118239171ad8 | |
| parent | gerbera: fix build with fmt-10.1 (diff) | |
| download | nixpkgs-05a33a501552095d3fb0fcd9f5ce4506fa9c8ad4.tar.gz | |
nheko: fix build with fmt-10.1
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/nheko/default.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 5dc6bde6fed6..acc6f8948fc0 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , asciidoc , pkg-config @@ -42,6 +43,22 @@ stdenv.mkDerivation rec { hash = "sha256-2daXxTbpSUlig47y901JOkWRxbZGH4qrvNMepJbvS3o="; }; + patches = [ + # The 2 following patches can be removed with the next version bump. + # Backport of https://github.com/Nheko-Reborn/nheko/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0. + (fetchpatch { + name = "nheko-fmt10.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/nheko/-/raw/1b0d5c9eff6409dfd82953f346546d36c288a4a9/nheko-0.11.3-fix-for-fmt-10.patch"; + hash = "sha256-UYqAu2iXT3Bn/MxCtybiJrJLfVMOOVRchWqrGuPfapI="; + }) + # https://github.com/Nheko-Reborn/nheko/pull/1552 + (fetchpatch { + name = "nheko-fmt10.1.patch"; + url = "https://github.com/Nheko-Reborn/nheko/commit/614facf93c2b5d6118beb822cc542ac53a883c37.patch"; + hash = "sha256-rjsQNDfj3Lzbv8ow3qiNozGXQFrtYLhArS6a9JCdgBQ="; + }) + ]; + nativeBuildInputs = [ asciidoc cmake |