From 02d6fd212f2e842989a9787e0e5895c821c5d9e9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 5 Feb 2025 22:50:20 +0100 Subject: [PATCH] pinball: 0.3.20201218 -> 0.3.20201218-unstable-2024-11-14 Fixes build, and uses modern SDL. Source repo and homepage are updated to GitHub repo linked from the old Sourceforge one. --- pkgs/by-name/pi/pinball/package.nix | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/pi/pinball/package.nix b/pkgs/by-name/pi/pinball/package.nix index 67f35ab0b1e3..125406ee9f9f 100644 --- a/pkgs/by-name/pi/pinball/package.nix +++ b/pkgs/by-name/pi/pinball/package.nix @@ -1,23 +1,26 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, autoreconfHook, pkg-config, libglvnd, - SDL, - SDL_image, - SDL_mixer, + libtool, + SDL2, + SDL2_image, + SDL2_mixer, xorg, }: stdenv.mkDerivation rec { pname = "pinball"; - version = "0.3.20201218"; + version = "0.3.20201218-unstable-2024-11-14"; - src = fetchurl { - url = "mirror://sourceforge/pinball/pinball-${version}.tar.gz"; - sha256 = "0vacypp3ksq1hs6hxpypx7nrfkprbl4ksfywcncckwrh4qcir631"; + src = fetchFromGitHub { + owner = "adoptware"; + repo = "pinball"; + rev = "7f6887d8912340c0eee7f96b4c4bb84c8d889246"; + hash = "sha256-8wuux7eC0OkgL/m20eyRGRrAF1lBGAbd7Gmid9cNPto="; }; postPatch = '' @@ -30,26 +33,23 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libglvnd - SDL - SDL_image - SDL_mixer + libtool + SDL2 + SDL2_image + SDL2_mixer xorg.libSM ]; strictDeps = true; - configureFlags = [ - "--with-sdl-prefix=${lib.getDev SDL}" - ]; - env.NIX_CFLAGS_COMPILE = toString [ - "-I${lib.getDev SDL_image}/include/SDL" - "-I${lib.getDev SDL_mixer}/include/SDL" + "-I${lib.getDev SDL2_image}/include/SDL2" + "-I${lib.getDev SDL2_mixer}/include/SDL2" ]; enableParallelBuilding = true; meta = with lib; { - homepage = "https://purl.org/rzr/pinball"; + homepage = "https://github.com/adoptware/pinball"; description = "Emilia Pinball simulator"; license = licenses.gpl2Only; maintainers = with maintainers; [ qyliss ];