diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-12 12:09:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 12:09:45 +0000 |
| commit | 6705a4135294e863b9284ad43a88975bda95cb34 (patch) | |
| tree | 2af1475847e9d6f3514b80c9818b99e8a2111e6f /pkgs/shells | |
| parent | 8f43c6e3a77e94df4bd44e5efe0048763dbdad42 (diff) | |
| parent | d544a4fb0794a5852dec6c433d2bfccd0e758790 (diff) | |
| download | nixpkgs-6705a4135294e863b9284ad43a88975bda95cb34.tar nixpkgs-6705a4135294e863b9284ad43a88975bda95cb34.tar.gz nixpkgs-6705a4135294e863b9284ad43a88975bda95cb34.tar.bz2 nixpkgs-6705a4135294e863b9284ad43a88975bda95cb34.tar.lz nixpkgs-6705a4135294e863b9284ad43a88975bda95cb34.tar.xz nixpkgs-6705a4135294e863b9284ad43a88975bda95cb34.tar.zst nixpkgs-6705a4135294e863b9284ad43a88975bda95cb34.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh/zsh-fzf-tab/darwin.patch | 11 | ||||
| -rw-r--r-- | pkgs/shells/zsh/zsh-fzf-tab/default.nix | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/shells/zsh/zsh-fzf-tab/darwin.patch b/pkgs/shells/zsh/zsh-fzf-tab/darwin.patch deleted file mode 100644 index 54b6ce26138..00000000000 --- a/pkgs/shells/zsh/zsh-fzf-tab/darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/modules/Src/aloxaf/fzftab.c b/modules/Src/aloxaf/fzftab.c -index 60b6330..91975d8 100644 ---- a/modules/Src/aloxaf/fzftab.c -+++ b/modules/Src/aloxaf/fzftab.c -@@ -1,6 +1,5 @@ - #include "fzftab.mdh" - #include "fzftab.pro" --#include <malloc.h> - #include <stdarg.h> - #include <stdlib.h> - #include <sys/stat.h> diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index f88469a2ef3..5ce66fd8133 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -16,8 +16,6 @@ in stdenv.mkDerivation rec { strictDeps = true; buildInputs = [ ncurses ]; - patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; - postConfigure = '' pushd modules ./configure --disable-gdbm --without-tcsetpgrp |