From 711b572d22a1f2dd285a86feb85781334b572948 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 14 Aug 2021 12:33:23 +0200 Subject: [PATCH 1/2] catgirl: fix warnings related to flock not being defined There were a few complaints about this, so ppl seem to care about C compiler's warnings. --- pkgs/applications/networking/irc/catgirl/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index 1bc51def0cd2..1c25d43bc105 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -1,4 +1,4 @@ -{ ctags, fetchurl, lib, libressl, man, ncurses, pkg-config, stdenv }: +{ ctags, fetchurl, fetchpatch, lib, libressl, man, ncurses, pkg-config, stdenv }: stdenv.mkDerivation rec { pname = "catgirl"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "182l7yryqm1ffxqgz3i4lcnzwzpbpm2qvadddmj0xc8dh8513s0w"; }; + patches = [ + (fetchpatch { + url = "https://git.causal.agency/catgirl/patch/?id=3f3585d0f32e66ad5c8c6c713f315e14810230eb"; + sha256 = "1vrgimvf007bxz8blxm3vjc7g3xwxplwxyrblnsryq54cqaw0xv3"; + }) + ]; + nativeBuildInputs = [ ctags pkg-config ]; buildInputs = [ libressl man ncurses ]; strictDeps = true; From 9ad15b39c64fa583d1f2f99dfc3204fe74babb61 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 14 Aug 2021 12:37:31 +0200 Subject: [PATCH 2/2] catgirl: remove unnecessary `man` buildInput --- pkgs/applications/networking/irc/catgirl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index 1c25d43bc105..c648570958d3 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -1,4 +1,4 @@ -{ ctags, fetchurl, fetchpatch, lib, libressl, man, ncurses, pkg-config, stdenv }: +{ ctags, fetchurl, fetchpatch, lib, libressl, ncurses, pkg-config, stdenv }: stdenv.mkDerivation rec { pname = "catgirl"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ ctags pkg-config ]; - buildInputs = [ libressl man ncurses ]; + buildInputs = [ libressl ncurses ]; strictDeps = true; meta = with lib; {