Merge pull request #207881 from luxzeitlos/nanosaur2

nanosaur2: init at 2.1.0, nanosaur: fix build

pkgs/games/nanosaur/default.nix

@@ -12,22 +12,31 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ cmake makeWrapper ];
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+  ];
   buildInputs = [
     SDL2
   ];
 
   configurePhase = ''
+    runHook preConfigure
     cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
+    runHook postConfigure
   '';
 
   buildPhase = ''
+    runHook preBuild
     cmake --build build
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
     mv build $out
     makeWrapper $out/Nanosaur $out/bin/Nanosaur --chdir "$out"
+    runHook postInstall
   '';
 
   meta = with lib; {
@@ -38,9 +47,7 @@ stdenv.mkDerivation rec {
       And you get to shoot at T-Rexes with nukes.
     '';
     homepage = "https://github.com/jorio/Nanosaur";
-    license = with licenses; [
+    license = licenses.cc-by-sa-40;
-      cc-by-sa-40
-    ];
     maintainers = with maintainers; [ lux ];
     platforms = platforms.linux;
   };

pkgs/games/nanosaur2/default.nix

@@ -0,0 +1,54 @@
+{ lib, stdenv, fetchFromGitHub, SDL2, cmake, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "nanosaur2";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "jorio";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-UY+fyn8BA/HfCd2LCj5cfGmQACKUICH6CDCW4q6YDkg=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+  ];
+  buildInputs = [
+    SDL2
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+    cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    cmake --build build
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mv build $out
+    makeWrapper $out/Nanosaur2 $out/bin/Nanosaur2 --chdir "$out"
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A port of Nanosaur2, a 2004 Macintosh game by Pangea Software, for modern operating systems";
+    longDescription = ''
+      Nanosaur is a 2004 Macintosh game by Pangea Software.
+
+      Is a continuation of the original Nanosaur storyline, only this time you get to fly a pterodactyl who’s loaded with hi-tech weaponry.
+    '';
+    homepage = "https://github.com/jorio/Nanosaur2";
+    license = licenses.cc-by-sa-40;
+    maintainers = with maintainers; [ lux ];
+    platforms = platforms.linux;
+  };
+}

pkgs/games/otto-matic/default.nix

@@ -35,9 +35,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A port of Otto Matic, a 2001 Macintosh game by Pangea Software, for modern operating systems";
     homepage = "https://github.com/jorio/OttoMatic";
-    license = with licenses; [
+    license = licenses.cc-by-sa-40;
-      cc-by-sa-40
-    ];
     maintainers = with maintainers; [ lux ];
     platforms = platforms.linux;
   };

pkgs/top-level/all-packages.nix

@@ -34695,6 +34695,8 @@ with pkgs;
 
   nanosaur = callPackage ../games/nanosaur { };
 
+  nanosaur2 = callPackage ../games/nanosaur2 { };
+
   nethack = callPackage ../games/nethack { };
 
   nethack-qt = callPackage ../games/nethack {