diff options
| author | Marco Rebhan <me@dblsaiko.net> | 2023-11-25 14:02:23 +0100 |
|---|---|---|
| committer | jupblb <jupblb@google.com> | 2024-01-02 12:57:11 +0100 |
| commit | b581159a97f1da123c342da2aa0359db2e93eb93 (patch) | |
| tree | 07789f52b1ac19f9c958e3bb2f6f769c8124655a | |
| parent | Merge pull request #278192 from NixOS/backport-274007-to-release-23.11 (diff) | |
| download | nixpkgs-b581159a97f1da123c342da2aa0359db2e93eb93.tar.gz | |
kakoune: fix compiling with clang for macOS
(cherry picked from commit 6bcb7fade49e4ab3de4b538853810020abe4decb)
| -rw-r--r-- | pkgs/applications/editors/kakoune/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 5ca75e76cdf4..fa0e485d7128 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; @@ -9,6 +9,18 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-RR3kw39vEjsg+6cIY6cK2i3ecGHlr1yzuBKaDtGlOGo="; }; + patches = [ + # Use explicit target types for gather calls to bypass clang regression + # + # Since clang-16 there has been a regression in the P0522R0 support. + # (Bug report at https://github.com/llvm/llvm-project/issue/63281) + # + # Closes mawww/kakoune#4892 + (fetchpatch { + url = "https://github.com/mawww/kakoune/commit/7577fa1b668ea81eb9b7b9af690a4161187129dd.patch"; + hash = "sha256-M0jKaEDhkpvX+n7k8Jf2lWaRNy8bqZ1kRHR4eG4npss="; + }) + ]; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; preConfigure = '' |