diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix deleted file mode 100644 index 6d57f49a6a30..000000000000 --- a/pkgs/applications/misc/xsw/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - SDL, - SDL_image, - SDL_ttf, - SDL_gfx, - flex, - bison, -}: - -let - makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); - -in -stdenv.mkDerivation rec { - pname = "xsw"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "andrenho"; - repo = "xsw"; - rev = version; - sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g"; - }; - - nativeBuildInputs = [ - pkg-config - flex - bison - ]; - - buildInputs = [ - SDL - SDL_image - SDL_ttf - SDL_gfx - ]; - - env.NIX_CFLAGS_COMPILE = - toString (makeSDLFlags [ - SDL - SDL_image - SDL_ttf - SDL_gfx - ]) - + " -lSDL"; - - patches = [ - ./parse.patch # Fixes compilation error by avoiding redundant definitions. - ./sdl-error.patch # Adds required include for SDL_GetError. - ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Slide show presentation tool"; - - platforms = platforms.unix; - license = licenses.gpl3; - maintainers = [ ]; - mainProgram = "xsw"; - }; -} diff --git a/pkgs/applications/misc/xsw/parse.patch b/pkgs/applications/misc/xsw/parse.patch deleted file mode 100644 index 6db6c14c26a7..000000000000 --- a/pkgs/applications/misc/xsw/parse.patch +++ /dev/null @@ -1,21 +0,0 @@ -The `%code` causes Color definition to be added in both parser.h and parser.c -causing duplicate definitions error. This ensures that once it has been included -as part of parser.h, it wont be redefined in parser.c - ---- xsw-0.1.2-src/src/parser.y 1969-12-31 16:00:01.000000000 -0800 -+++ xsw-0.1.2-src/src/parser.y 2016-06-28 13:21:35.707027770 -0700 -@@ -38,7 +38,13 @@ - - %} - --%code requires { typedef struct { unsigned char c; } Color; } -+%code requires -+{ -+#ifndef COLORDEF -+#define COLORDEF -+typedef struct { unsigned char c; } Color; -+#endif -+} - - %token SLIDE COLON HIFEN TEXT X Y W H IMAGE SIZE SCALE TEMPLATE BACKGROUND FONT - %token STYLE ALIGN EXPAND PLUS IMAGE_PATH diff --git a/pkgs/applications/misc/xsw/sdl-error.patch b/pkgs/applications/misc/xsw/sdl-error.patch deleted file mode 100644 index 83751e3cf5fc..000000000000 --- a/pkgs/applications/misc/xsw/sdl-error.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/presenter.c b/src/presenter.c -index a082541..74bfbec 100644 ---- a/src/presenter.c -+++ b/src/presenter.c -@@ -5,5 +5,6 @@ - #include - #include "SDL_ttf.h" -+#include - #include "presenter.h" - #include "execute.h" - #include "list.h" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aa07690cc19a..c98e3bcd08be 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2402,6 +2402,7 @@ mapAliases { xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 xsd = throw "'xsd' has been removed."; # Added 2025-04-02 xsv = throw "'xsv' has been removed due to lack of upstream maintenance. Please see 'xan' for a maintained alternative"; + xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22 xtrlock-pam = throw "xtrlock-pam has been removed because it is unmaintained for 10 years and doesn't support Python 3.10 or newer"; # Added 2025-01-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d6d78cbac2b..e9cb3198772a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15649,16 +15649,6 @@ with pkgs; } ); - xsw = callPackage ../applications/misc/xsw { - # Enable the next line to use this in terminal. - # Note that it requires sixel capable terminals such as mlterm - # or xterm -ti 340 - SDL = SDL_sixel; - SDL_gfx = SDL_gfx.override { SDL = SDL_sixel; }; - SDL_image = SDL_image.override { SDL = SDL_sixel; }; - SDL_ttf = SDL_ttf.override { SDL = SDL_sixel; }; - }; - yamale = with python3Packages; toPythonApplication yamale; zap-chip-gui = zap-chip.override { withGui = true; };