From ab07aeec5809056a4d3b2fdc5d3537cccefad013 Mon Sep 17 00:00:00 2001 From: whispers Date: Wed, 22 Jul 2026 11:01:27 -0400 Subject: [PATCH] cwiid: drop cwiid's wmgui depends on the long-deprecated gtk2, which we want to delete. theoretically we could keep just libcwiid around, but the case for an old codebase that doesn't seem to have been touched in 17 years is not particularly compelling. --- pkgs/by-name/cw/cwiid/fix-ar.diff | 26 ------------- pkgs/by-name/cw/cwiid/package.nix | 65 ------------------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 pkgs/by-name/cw/cwiid/fix-ar.diff delete mode 100644 pkgs/by-name/cw/cwiid/package.nix diff --git a/pkgs/by-name/cw/cwiid/fix-ar.diff b/pkgs/by-name/cw/cwiid/fix-ar.diff deleted file mode 100644 index 8ca4b885a0a3..000000000000 --- a/pkgs/by-name/cw/cwiid/fix-ar.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in -index 3afbb14..b8df9d9 100644 ---- a/common/include/lib.mak.in -+++ b/common/include/lib.mak.in -@@ -22,7 +22,7 @@ static: $(STATIC_LIB) - shared: $(SHARED_LIB) - - $(STATIC_LIB): $(OBJECTS) -- ar rcs $(STATIC_LIB) $(OBJECTS) -+ $(AR) rcs $(STATIC_LIB) $(OBJECTS) - - $(SHARED_LIB): $(OBJECTS) - $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \ -diff --git a/configure.ac b/configure.ac -index 82ca3e1..0a78283 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then - AC_MSG_ERROR([bison not found]) - fi - -+AC_CHECK_TOOL([AR], [ar], [:]) -+ - AC_ARG_WITH( - [python], - [AS_HELP_STRING([--without-python],[compile without python support])], diff --git a/pkgs/by-name/cw/cwiid/package.nix b/pkgs/by-name/cw/cwiid/package.nix deleted file mode 100644 index 2d7391811e6e..000000000000 --- a/pkgs/by-name/cw/cwiid/package.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - bison, - flex, - bluez, - pkg-config, - gtk2, -}: - -stdenv.mkDerivation { - pname = "cwiid"; - version = "unstable-2010-02-21"; - - src = fetchFromGitHub { - owner = "abstrakraft"; - repo = "cwiid"; - rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; - sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; - }; - - hardeningDisable = [ "format" ]; - - configureFlags = [ "--without-python" ]; - - prePatch = '' - sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in - ''; - - patches = [ - ./fix-ar.diff - ]; - - buildInputs = [ - bluez - gtk2 - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - bison - flex - ]; - - env = { - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - NIX_LDFLAGS = "-lbluetooth"; - }; - - postInstall = '' - # Some programs (for example, cabal-install) have problems with the double 0 - sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc - ''; - - meta = { - description = "Linux Nintendo Wiimote interface"; - homepage = "http://cwiid.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ bennofs ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6b61c67fd663..d4c2941eecfc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -636,6 +636,7 @@ mapAliases { curlHTTP3 = warnAlias "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22 cvemap = vulnx; # Added 2026-04-19 cwe-client-cli = throw "cwe-client-cli has been removed because it is archived and has unclear licensing"; # Added 2026-01-10 + cwiid = throw "'cwiid' was removed because it depended on the deprecated GTK2 engine."; # Added 2026-07-22 cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21