fzf-tab-zsh: fix build with gcc14 (#368738)

NixOS · Dec 28, 2024 · 20cb6a3 · 20cb6a3
2 parents 3c344c2 + ea15e6b
commit 20cb6a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -5768,6 +5768,12 @@
     githubId = 11946442;
     name = "Dipin Hora";
   };
+  diredocks = {
+    email = "[email protected]";
+    github = "diredocks";
+    githubId = 26994007;
+    name = "Chen Xin";
+  };
   dirkx = {
     email = "[email protected]";
     github = "dirkx";

diff --git a/pkgs/by-name/zs/zsh-fzf-tab/package.nix b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   zsh,
   ncurses,
+  autoconf,
   nix-update-script,
 }:
 
@@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
+  nativeBuildInputs = [ autoconf ];
   buildInputs = [ ncurses ];
 
   # https://github.com/Aloxaf/fzf-tab/issues/337
@@ -44,6 +46,8 @@ stdenv.mkDerivation rec {
 
     pushd zsh-${zsh.version}
 
+    # Apply patches from zsh
+    ${lib.concatStringsSep "\n" (map (patch: "patch -p1 -i ${patch}") zsh.patches)}
 
     if [[ ! -f ./configure ]]; then
       ./Util/preconfig
@@ -93,7 +97,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Aloxaf/fzf-tab";
     description = "Replace zsh's default completion selection menu with fzf!";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ vonfry ];
+    maintainers = with lib.maintainers; [ diredocks ];
     platforms = lib.platforms.unix;
   };
 }