diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/by-name/do/doomretro/package.nix similarity index 87% rename from pkgs/games/doom-ports/doomretro/default.nix rename to pkgs/by-name/do/doomretro/package.nix index 794f3c7194ff..810acbb06daa 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -1,23 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, SDL2 -, SDL2_image -, SDL2_mixer -, Cocoa +{ + lib, + SDL2, + SDL2_image, + SDL2_mixer, + cmake, + darwin, + fetchFromGitHub, + pkg-config, + stdenv, }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.4"; + version = "5.5.1"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-IOv58BmJvJtO7MMbrvf52MPYI0zjmPuRK7mcTwmBEY0="; + hash = "sha256-gAMMzHUo0uPXIRqT1NOMWpFNAtE1Pth5uXFa2Dps90E="; }; nativeBuildInputs = [ @@ -29,14 +33,13 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_image SDL2_mixer - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + + strictDeps = true; meta = { homepage = "https://www.doomretro.com/"; description = "Classic, refined DOOM source port"; - mainProgram = "doomretro"; longDescription = '' DOOM Retro is the classic, refined DOOM source port for Windows PC. It represents how I like my DOOM to be today, in all its dark and gritty, @@ -67,8 +70,8 @@ stdenv.mkDerivation (finalAttrs: { to no support is provided, DOOM Retro's source code may also be compiled and run under Linux and macOS. ''; - changelog = "https://github.com/bradharding/doomretro/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; + mainProgram = "doomretro"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6e581ccf2d4..d229ea8f730e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35406,10 +35406,6 @@ with pkgs; doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { }; - doomretro = callPackage ../games/doom-ports/doomretro { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - doomrunner = qt5.callPackage ../games/doom-ports/doomrunner { }; chocolate-doom = callPackage ../games/doom-ports/chocolate-doom { };