diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-08 20:22:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-08 20:22:47 +0100 |
commit | 582a0ad152b017c619bf8f335de37bdaf6e5d7e1 (patch) | |
tree | 096674c74bd80a8d6a4a1c4a95aa3c4cc63cacc8 | |
parent | 66b5ec6e7bb72ae4a3ca5752df93889af8cf9639 (diff) | |
parent | f982103f5d1cf96a4cb2e9e7efa8d87320349ba7 (diff) | |
download | nixlib-582a0ad152b017c619bf8f335de37bdaf6e5d7e1.tar nixlib-582a0ad152b017c619bf8f335de37bdaf6e5d7e1.tar.gz nixlib-582a0ad152b017c619bf8f335de37bdaf6e5d7e1.tar.bz2 nixlib-582a0ad152b017c619bf8f335de37bdaf6e5d7e1.tar.lz nixlib-582a0ad152b017c619bf8f335de37bdaf6e5d7e1.tar.xz nixlib-582a0ad152b017c619bf8f335de37bdaf6e5d7e1.tar.zst nixlib-582a0ad152b017c619bf8f335de37bdaf6e5d7e1.zip |
Merge pull request #291286 from atorres1985-contrib/lgames
lgames: migrate to by-name
-rw-r--r-- | pkgs/by-name/ba/barrage/package.nix (renamed from pkgs/games/lgames/barrage/default.nix) | 17 | ||||
-rw-r--r-- | pkgs/by-name/lb/lbreakout2/package.nix | 49 | ||||
-rw-r--r-- | pkgs/by-name/lb/lbreakouthd/package.nix (renamed from pkgs/games/lgames/lbreakouthd/default.nix) | 7 | ||||
-rw-r--r-- | pkgs/by-name/lp/lpairs2/package.nix (renamed from pkgs/games/lgames/lpairs2/default.nix) | 23 | ||||
-rw-r--r-- | pkgs/games/lgames/lbreakout2/default.nix | 48 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
6 files changed, 74 insertions, 80 deletions
diff --git a/pkgs/games/lgames/barrage/default.nix b/pkgs/by-name/ba/barrage/package.nix index 822ec04f1d45..a606d4f3dfdf 100644 --- a/pkgs/games/lgames/barrage/default.nix +++ b/pkgs/by-name/ba/barrage/package.nix @@ -1,16 +1,16 @@ { lib -, stdenv -, fetchurl , SDL , SDL_mixer +, fetchurl +, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "barrage"; version = "1.0.7"; src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/lgames/barrage-${finalAttrs.version}.tar.gz"; hash = "sha256-cGYrG7A4Ffh51KyR+UpeWu7A40eqxI8g4LefBIs18kg="; }; @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with lib; { + meta = { homepage = "https://lgames.sourceforge.io/Barrage/"; description = "A destructive action game"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "barrage"; + maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL.meta) platforms; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix new file mode 100644 index 000000000000..bd88ac2a21f2 --- /dev/null +++ b/pkgs/by-name/lb/lbreakout2/package.nix @@ -0,0 +1,49 @@ +{ lib +, SDL +, SDL_mixer +, fetchpatch +, fetchurl +, libintl +, libpng +, stdenv +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lbreakout2"; + version = "2.6.5"; + + src = fetchurl { + url = "mirror://sourceforge/lgames/lbreakout2-${finalAttrs.version}.tar.gz"; + hash = "sha256-kQTWF1VT2jRC3GpfxAemaeL1r/Pu3F0wQJ6wA7enjW8="; + }; + + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/l/lbreakout2/2.6.5-2/debian/patches/sdl_fix_pauses.patch"; + hash = "sha256-ycsuxfokpOblLky42MwtJowdEp7v5dZRMFIR4id4ZBI="; + }) + ]; + + buildInputs = [ + SDL + SDL_mixer + libintl + libpng + zlib + ]; + + # With fortify it crashes at runtime: + # *** buffer overflow detected ***: terminated + # Aborted (core dumped) + hardeningDisable = [ "fortify" ]; + + meta = { + homepage = "http://lgames.sourceforge.net/LBreakout2/"; + description = "Breakout clone from the LGames series"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "lbreakout2"; + maintainers = with lib.maintainers; [ AndersonTorres ciil ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/by-name/lb/lbreakouthd/package.nix index 64be757c35ad..0160d7e2033b 100644 --- a/pkgs/games/lgames/lbreakouthd/default.nix +++ b/pkgs/by-name/lb/lbreakouthd/package.nix @@ -1,11 +1,11 @@ { lib -, stdenv -, fetchurl -, directoryListingUpdater , SDL2 , SDL2_image , SDL2_mixer , SDL2_ttf +, directoryListingUpdater +, fetchurl +, stdenv }: stdenv.mkDerivation (finalAttrs: { @@ -36,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://lgames.sourceforge.io/LBreakoutHD/"; description = "A widescreen Breakout clone"; license = lib.licenses.gpl2Plus; + mainProgram = "lbreakouthd"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL2.meta) platforms; broken = stdenv.isDarwin; diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/by-name/lp/lpairs2/package.nix index 7993fd0657da..a7ecd6c0f3c9 100644 --- a/pkgs/games/lgames/lpairs2/default.nix +++ b/pkgs/by-name/lp/lpairs2/package.nix @@ -1,19 +1,19 @@ { lib -, stdenv -, fetchurl , SDL2 , SDL2_image , SDL2_mixer , SDL2_ttf , directoryListingUpdater +, fetchurl +, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lpairs2"; version = "2.3"; src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/lgames/lpairs2-${finalAttrs.version}.tar.gz"; hash = "sha256-gw1BNkcztyTuoXRdx5+TBZNJEJNrLCfEUCQ1JzROogA="; }; @@ -25,17 +25,18 @@ stdenv.mkDerivation rec { ]; passthru.updateScript = directoryListingUpdater { - inherit pname version; + inherit (finalAttrs) pname version; url = "https://lgames.sourceforge.io/LPairs/"; extraRegex = "(?!.*-win(32|64)).*"; }; - meta = with lib; { - broken = stdenv.isDarwin; + meta = { homepage = "http://lgames.sourceforge.net/LPairs/"; description = "Matching the pairs - a typical Memory Game"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "lpairs2"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/games/lgames/lbreakout2/default.nix b/pkgs/games/lgames/lbreakout2/default.nix deleted file mode 100644 index f554a1683eee..000000000000 --- a/pkgs/games/lgames/lbreakout2/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, SDL -, SDL_mixer -, libintl -, libpng -, zlib -}: - -stdenv.mkDerivation rec { - pname = "lbreakout2"; - version = "2.6.5"; - - src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; - }; - - # Can't exit from pause without this patch - patches = [(fetchpatch { - url = "https://sources.debian.org/data/main/l/lbreakout2/2.6.5-2/debian/patches/sdl_fix_pauses.patch"; - hash = "sha256-ycsuxfokpOblLky42MwtJowdEp7v5dZRMFIR4id4ZBI="; - })]; - - buildInputs = [ - SDL - SDL_mixer - libintl - libpng - zlib - ]; - - # With fortify it crashes at runtime: - # *** buffer overflow detected ***: terminated - # Aborted (core dumped) - hardeningDisable = [ "fortify" ]; - - meta = with lib; { - homepage = "http://lgames.sourceforge.net/LBreakout2/"; - description = "Breakout clone from the LGames series"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.ciil ]; - platforms = platforms.unix; - hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9ed16a7990e..6e6e34420de0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37039,16 +37039,6 @@ with pkgs; zdoom = callPackage ../games/doom-ports/zdoom { }; - ### GAMES/LGAMES - - barrage = callPackage ../games/lgames/barrage { }; - - lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; - - lbreakouthd = callPackage ../games/lgames/lbreakouthd { }; - - lpairs2 = callPackage ../games/lgames/lpairs2 { }; - maelstrom = callPackage ../games/maelstrom { }; mar1d = callPackage ../games/mar1d { } ; |