From 2b763f66ce93652a227f31b2144ed02c4ae83e0d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 1 May 2023 12:48:42 -0300 Subject: crispyDoom: move to games/doom-ports --- pkgs/games/crispy-doom/default.nix | 36 --------------------------- pkgs/games/doom-ports/crispy-doom/default.nix | 36 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 pkgs/games/crispy-doom/default.nix create mode 100644 pkgs/games/doom-ports/crispy-doom/default.nix diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix deleted file mode 100644 index a4a0fc08730..00000000000 --- a/pkgs/games/crispy-doom/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python3 }: - -stdenv.mkDerivation rec { - pname = "crispy-doom"; - version = "6.0"; - - src = fetchFromGitHub { - owner = "fabiangreffrath"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-s/TAg0Di8Pkdjhk38c8OanmngjLqA8iEPweVRf1qwQI="; - }; - - postPatch = '' - sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am - for script in $(grep -lr '^#!/usr/bin/env python3$'); do patchShebangs $script; done - ''; - - nativeBuildInputs = [ autoreconfHook pkg-config python3 ]; - buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; - enableParallelBuilding = true; - - strictDeps = true; - - meta = { - homepage = "http://fabiangreffrath.github.io/crispy-doom"; - description = "A limit-removing enhanced-resolution Doom source port based on Chocolate Doom"; - longDescription = '' - Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom. - Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin. - ''; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ neonfuz ]; - }; -} diff --git a/pkgs/games/doom-ports/crispy-doom/default.nix b/pkgs/games/doom-ports/crispy-doom/default.nix new file mode 100644 index 00000000000..a4a0fc08730 --- /dev/null +++ b/pkgs/games/doom-ports/crispy-doom/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "crispy-doom"; + version = "6.0"; + + src = fetchFromGitHub { + owner = "fabiangreffrath"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-s/TAg0Di8Pkdjhk38c8OanmngjLqA8iEPweVRf1qwQI="; + }; + + postPatch = '' + sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am + for script in $(grep -lr '^#!/usr/bin/env python3$'); do patchShebangs $script; done + ''; + + nativeBuildInputs = [ autoreconfHook pkg-config python3 ]; + buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; + enableParallelBuilding = true; + + strictDeps = true; + + meta = { + homepage = "http://fabiangreffrath.github.io/crispy-doom"; + description = "A limit-removing enhanced-resolution Doom source port based on Chocolate Doom"; + longDescription = '' + Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom. + Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin. + ''; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ neonfuz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f9c66ee017..0661c7bea0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35749,6 +35749,8 @@ with pkgs; chocolateDoom = callPackage ../games/doom-ports/chocolate-doom { }; + crispyDoom = callPackage ../games/doom-ports/crispy-doom { }; + ### GAMES/LGAMES barrage = callPackage ../games/lgames/barrage { }; @@ -35930,8 +35932,6 @@ with pkgs; clonehero = callPackage ../games/clonehero/fhs-wrapper.nix { }; - crispyDoom = callPackage ../games/crispy-doom { }; - vintagestory = callPackage ../games/vintagestory { }; ckan = callPackage ../games/ckan { }; -- cgit 1.4.1