From 13a8967d73a67bbf9ce3a84b30496264a5dc09bc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 16 Oct 2023 00:12:58 +0200 Subject: [PATCH] ballAndPaddle: drop --- pkgs/games/ball-and-paddle/default.nix | 45 -------------------- pkgs/games/ball-and-paddle/getenv-decl.patch | 13 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/games/ball-and-paddle/default.nix delete mode 100644 pkgs/games/ball-and-paddle/getenv-decl.patch diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix deleted file mode 100644 index a935f3d46863..000000000000 --- a/pkgs/games/ball-and-paddle/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_ttf, guile, gettext }: - -stdenv.mkDerivation rec { - pname = "ballandpaddle"; - version = "0.8.1"; - - src = fetchurl { - url = "mirror://gnu/ballandpaddle/ballandpaddle-${version}.tar.gz"; - sha256 = "0zgpydad0mj7fbkippw3n9hlda6nac084dq5xfbsks9jn1xd30ny"; - }; - - buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf guile gettext ]; - - patches = [ ./getenv-decl.patch ]; - - preConfigure = '' - sed -i "Makefile.in" \ - -e "s|desktopdir *=.*$|desktopdir = $out/share/applications|g ; - s|pixmapsdir *=.*$|pixmapsdir = $out/share/pixmaps|g" - ''; - - meta = { - description = "GNU Ball and Paddle, an old-fashioned ball and paddle game"; - - longDescription = '' - GNU Ball and Paddle is an old-fashioned ball and paddle game - with a set amount of blocks to destroy on each level, while - moving a paddle left and right at the bottom of the - screen. Various powerups may make different things occur. - - It now uses GNU Guile for extension and the levels are written - with Guile. Follow the example level sets and the documentation. - ''; - - license = lib.licenses.gpl3Plus; - - homepage = "https://www.gnu.org/software/ballandpaddle/"; - - maintainers = [ ]; - - platforms = lib.platforms.unix; - - hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin - }; -} diff --git a/pkgs/games/ball-and-paddle/getenv-decl.patch b/pkgs/games/ball-and-paddle/getenv-decl.patch deleted file mode 100644 index 6bf26b50a142..000000000000 --- a/pkgs/games/ball-and-paddle/getenv-decl.patch +++ /dev/null @@ -1,13 +0,0 @@ -Make the getenv(3) declaration visible. - ---- ballandpaddle-0.8.1/src/settingsmanager.cpp 2009-07-08 02:13:16.000000000 +0200 -+++ ballandpaddle-0.8.1/src/settingsmanager.cpp 2009-07-16 23:30:28.000000000 +0200 -@@ -17,6 +17,7 @@ - * along with this program. If not, see . - **/ - -+#include - #include "settingsmanager.h" - - SettingsManager::SettingsManager () - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 737389444634..4f6bfb4880a4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -83,6 +83,7 @@ mapAliases ({ badtouch = authoscope; # Project was renamed, added 20210626 baget = throw "'baget' has been removed due to being unmaintained"; + ballAndPaddle = throw "'ballAndPaddle' has been removed because it was broken and abandoned upstream"; # Added 2023-10-16 bashInteractive_5 = bashInteractive; # Added 2021-08-20 bash_5 = bash; # Added 2021-08-20 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f3087038877..bb94c6e3b141 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37520,10 +37520,6 @@ with pkgs; azimuth = callPackage ../games/azimuth { }; - ballAndPaddle = callPackage ../games/ball-and-paddle { - guile = guile_1_8; - }; - banner = callPackage ../games/banner { }; bastet = callPackage ../games/bastet { };