diff --git a/pkgs/games/frozen-bubble/fix-compilation.patch b/pkgs/by-name/fr/frozen-bubble/fix-compilation.patch similarity index 100% rename from pkgs/games/frozen-bubble/fix-compilation.patch rename to pkgs/by-name/fr/frozen-bubble/fix-compilation.patch diff --git a/pkgs/by-name/fr/frozen-bubble/package.nix b/pkgs/by-name/fr/frozen-bubble/package.nix new file mode 100644 index 0000000000000..40610b9c1ddb7 --- /dev/null +++ b/pkgs/by-name/fr/frozen-bubble/package.nix @@ -0,0 +1,74 @@ +{ + lib, + fetchurl, + perlPackages, + pkg-config, + SDL, + SDL_mixer, + SDL_Pango, + glib, + copyDesktopItems, + makeDesktopItem, + fetchpatch, +}: + +perlPackages.buildPerlModule { + pname = "frozen-bubble"; + version = "2.212"; + + src = fetchurl { + url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz"; + hash = "sha256-ch4E/2nFIzBgZWv79AAqoa6t2WyVNR8MV7uFtto1owU="; + }; + + patches = [ + ./fix-compilation.patch + (fetchpatch { + # https://github.com/kthakore/frozen-bubble/pull/82 + url = "https://github.com/kthakore/frozen-bubble/commit/1aacc67254a0aafd856086cc306e9f7b389c6bf4.patch?full_index=1"; + hash = "sha256-RqJ+/UFv4esKWZBk0fttsEXhPMislEBTAl2oj4pLAZY="; + }) + ]; + + nativeBuildInputs = [ + copyDesktopItems + pkg-config + ]; + + buildInputs = [ + glib + SDL + SDL_mixer + SDL_Pango + perlPackages.SDL + perlPackages.FileSlurp + ]; + + propagatedBuildInputs = with perlPackages; [ + AlienSDL + CompressBzip2 + FileShareDir + FileWhich + IPCSystemSimple + LocaleMaketextLexicon + ]; + + perlPreHook = "export LD=$CC"; + + desktopItems = [ + (makeDesktopItem { + name = "frozen-bubble"; + exec = "frozen-bubble"; + desktopName = "Frozen Bubble"; + genericName = "Frozen Bubble"; + comment = "Arcade/reflex colour matching game"; + categories = [ "Game" ]; + }) + ]; + + meta = { + description = "Puzzle with Bubbles"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ puckipedia ]; + }; +} diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix deleted file mode 100644 index 72d0be794449e..0000000000000 --- a/pkgs/games/frozen-bubble/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib -, copyDesktopItems, makeDesktopItem -}: -perlPackages.buildPerlModule { - pname = "frozen-bubble"; - version = "2.212"; - - src = fetchurl { - url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz"; - sha256 = "721e04ff69c5233060656bfbf4002aa1aeadd96c95351f0c57bb85b6da35a305"; - }; - patches = [ ./fix-compilation.patch ]; - - nativeBuildInputs = [ copyDesktopItems pkg-config ]; - - buildInputs = [ glib SDL SDL_mixer SDL_Pango perlPackages.SDL perlPackages.FileSlurp ]; - propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 FileShareDir FileWhich IPCSystemSimple LocaleMaketextLexicon ]; - - perlPreHook = "export LD=$CC"; - - desktopItems = [ - (makeDesktopItem { - name = "frozen-bubble"; - exec = "frozen-bubble"; - desktopName = "Frozen Bubble"; - genericName = "Frozen Bubble"; - comment = "Arcade/reflex colour matching game"; - categories = [ "Game" ]; - }) - ]; - - meta = { - description = "Puzzle with Bubbles"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ puckipedia ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 097233e66afa0..5c951abffbf02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34431,8 +34431,6 @@ with pkgs; frogatto = callPackage ../games/frogatto { }; - frozen-bubble = callPackage ../games/frozen-bubble { }; - fsg = callPackage ../games/fsg { }; gambit-chess = callPackage ../games/gambit { };