From e28948add982f461a3c7485c99b2d1dbc839422f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 1 May 2023 13:57:52 -0300 Subject: eternity: move to games/doom-ports --- pkgs/games/doom-ports/eternity-engine/default.nix | 31 +++++++++++++++++++++++ pkgs/games/eternity-engine/default.nix | 31 ----------------------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 pkgs/games/doom-ports/eternity-engine/default.nix delete mode 100644 pkgs/games/eternity-engine/default.nix diff --git a/pkgs/games/doom-ports/eternity-engine/default.nix b/pkgs/games/doom-ports/eternity-engine/default.nix new file mode 100644 index 00000000000..cdff7fab1e1 --- /dev/null +++ b/pkgs/games/doom-ports/eternity-engine/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, cmake, libGL, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "eternity-engine"; + version = "4.02.00"; + src = fetchFromGitHub { + owner = "team-eternity"; + repo = "eternity"; + rev = version; + sha256 = "0dlz7axbiw003bgwk2hl43w8r2bwnxhi042i1xwdiwaja0cpnf5y"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libGL SDL2 SDL2_mixer SDL2_net ]; + + installPhase = '' + install -Dm755 eternity/eternity $out/lib/eternity/eternity + cp -r $src/base $out/lib/eternity/base + mkdir $out/bin + makeWrapper $out/lib/eternity/eternity $out/bin/eternity + ''; + + meta = { + homepage = "https://doomworld.com/eternity"; + description = "New school Doom port by James Haley"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ MP2E ]; + }; +} diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix deleted file mode 100644 index cdff7fab1e1..00000000000 --- a/pkgs/games/eternity-engine/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, cmake, libGL, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "eternity-engine"; - version = "4.02.00"; - src = fetchFromGitHub { - owner = "team-eternity"; - repo = "eternity"; - rev = version; - sha256 = "0dlz7axbiw003bgwk2hl43w8r2bwnxhi042i1xwdiwaja0cpnf5y"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ libGL SDL2 SDL2_mixer SDL2_net ]; - - installPhase = '' - install -Dm755 eternity/eternity $out/lib/eternity/eternity - cp -r $src/base $out/lib/eternity/base - mkdir $out/bin - makeWrapper $out/lib/eternity/eternity $out/bin/eternity - ''; - - meta = { - homepage = "https://doomworld.com/eternity"; - description = "New school Doom port by James Haley"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ MP2E ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b75532eeb1..a632c7f026d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35753,6 +35753,8 @@ with pkgs; enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { }; + eternity = callPackage ../games/doom-ports/eternity-engine { }; + ### GAMES/LGAMES barrage = callPackage ../games/lgames/barrage { }; @@ -36039,8 +36041,6 @@ with pkgs; endless-sky = callPackage ../games/endless-sky { }; - eternity = callPackage ../games/eternity-engine { }; - extremetuxracer = callPackage ../games/extremetuxracer { libpng = libpng12; }; -- cgit 1.4.1