diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/by-name/sa/sauerbraten/package.nix similarity index 73% rename from pkgs/games/sauerbraten/default.nix rename to pkgs/by-name/sa/sauerbraten/package.nix index b32ffadaea16..2951641fbf5f 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/by-name/sa/sauerbraten/package.nix @@ -1,22 +1,30 @@ -{ lib -, stdenv -, fetchzip -, SDL2 -, SDL2_image -, SDL2_mixer -, zlib -, makeWrapper -, copyDesktopItems -, makeDesktopItem +{ + lib, + stdenv, + fetchzip, + + # nativeBuildInputs + makeWrapper, + copyDesktopItems, + + # buildInputs + SDL2, + SDL2_image, + SDL2_mixer, + zlib, + + makeDesktopItem, }: stdenv.mkDerivation rec { pname = "sauerbraten"; - version = "2020-12-27"; + version = "2020-12-29"; src = fetchzip { - url = "mirror://sourceforge/sauerbraten/sauerbraten_${builtins.replaceStrings [ "-" ] [ "_" ] version}_linux.tar.bz2"; - sha256 = "0llknzj23vx6f3y452by9c7wlhzclyq4bqi22qd52m3l916z2mn5"; + url = "mirror://sourceforge/sauerbraten/sauerbraten_${ + builtins.replaceStrings [ "-" ] [ "_" ] version + }_linux.tar.bz2"; + hash = "sha256-os3SmonqHRw1+5dIRVt7EeXfnSq298GiyKpusS1K3rM="; }; nativeBuildInputs = [ @@ -26,8 +34,8 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 - SDL2_mixer SDL2_image + SDL2_mixer zlib ]; @@ -42,7 +50,11 @@ stdenv.mkDerivation rec { icon = "sauerbraten"; desktopName = "Sauerbraten"; comment = "FPS that uses an improved version of the Cube engine"; - categories = [ "Application" "Game" "ActionGame" ]; + categories = [ + "Application" + "Game" + "ActionGame" + ]; }) ]; @@ -64,16 +76,19 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Free multiplayer & singleplayer first person shooter, the successor of the Cube FPS"; homepage = "http://sauerbraten.org"; - maintainers = with maintainers; [ raskin ajs124 ]; + maintainers = with lib.maintainers; [ + raskin + ajs124 + ]; mainProgram = "sauerbraten_client"; hydraPlatforms = # raskin: tested amd64-linux; # not setting platforms because it is 0.5+ GiB of game data [ ]; license = "freeware"; # as an aggregate - data files have different licenses code is under zlib license - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c12c64eac07b..cd5e3b427ba9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35986,8 +35986,6 @@ with pkgs; openjdk = openjdk8; }; - sauerbraten = callPackage ../games/sauerbraten { }; - scid = callPackage ../games/scid { }; scid-vs-pc = callPackage ../games/scid-vs-pc { };