From b0ebb0636c43512e79141e968943fbcffc1a27ec Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 10 Feb 2024 12:38:12 +0000 Subject: [PATCH] nanosaur2: 2.1.0 -> 2.1.0-unstable-2023-05-21 This fixes `gcc-13` build failure on `master` as https://hydra.nixos.org/build/249142729: In file included from /build/source/extern/Pomme/src/PommeDebug.cpp:1: /build/source/extern/Pomme/src/PommeDebug.h:21:34: error: 'uint32_t' was not declared in this scope 21 | std::string FourCCString(uint32_t t, char filler = '?'); | ^~~~~~~~ --- pkgs/games/nanosaur2/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix index 7ab77623e653..92cf781da7d3 100644 --- a/pkgs/games/nanosaur2/default.nix +++ b/pkgs/games/nanosaur2/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, cmake, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, SDL2, cmake, makeWrapper, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "nanosaur2"; - version = "2.1.0"; + version = "2.1.0-unstable-2023-05-21"; src = fetchFromGitHub { owner = "jorio"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-UY+fyn8BA/HfCd2LCj5cfGmQACKUICH6CDCW4q6YDkg="; + rev = "72d93ed08148d81aa89bab511a9650d7b929d4c7"; + hash = "sha256-1AvM2KTQB9aUYB0e/7Y6h18yQvzsxMOgGkF9zPgTzFo="; fetchSubmodules = true; }; @@ -27,11 +27,13 @@ stdenv.mkDerivation rec { mv Data ReadMe.txt "$out/share/Nanosaur2/" install -Dm755 {.,$out/bin}/Nanosaur2 wrapProgram $out/bin/Nanosaur2 --chdir "$out/share/Nanosaur2" - install -Dm644 $src/packaging/nanosaur2.desktop $out/share/applications/nanosaur2.desktop - install -Dm644 $src/packaging/nanosaur2-desktopicon.png $out/share/pixmaps/nanosaur2-desktopicon.png + install -Dm644 $src/packaging/io.jor.nanosaur2.desktop $out/share/applications/nanosaur2.desktop + install -Dm644 $src/packaging/io.jor.nanosaur2.png $out/share/pixmaps/nanosaur2.png runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A port of Nanosaur2, a 2004 Macintosh game by Pangea Software, for modern operating systems"; longDescription = '' @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/jorio/Nanosaur2"; license = licenses.cc-by-sa-40; + mainProgram = "Nanosaur2"; maintainers = with maintainers; [ lux ]; platforms = platforms.linux; };