diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/cbonsai/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/freesweep/default.nix | 12 | ||||
-rw-r--r-- | pkgs/games/jumpy/default.nix | 1 | ||||
-rw-r--r-- | pkgs/games/nanosaur/default.nix | 15 | ||||
-rw-r--r-- | pkgs/games/nanosaur2/default.nix | 54 | ||||
-rw-r--r-- | pkgs/games/otto-matic/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/scummvm/default.nix | 17 | ||||
-rw-r--r-- | pkgs/games/trackballs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/vcmi/default.nix | 4 |
9 files changed, 85 insertions, 28 deletions
diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix index 30abbba93f28..2dc131aba6db 100644 --- a/pkgs/games/cbonsai/default.nix +++ b/pkgs/games/cbonsai/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installFlags = [ "PREFIX=$(out)" ]; - passthru.updateScript = nix-update-script { attrPath = pname; }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Grow bonsai trees in your terminal"; diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index 7fe48d1baf00..feba049a5cf0 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -1,5 +1,5 @@ -{ fetchFromGitHub, fetchpatch, ncurses, lib, stdenv, - updateAutotoolsGnuConfigScriptsHook }: +{ fetchFromGitHub, fetchpatch, ncurses, lib, stdenv +, updateAutotoolsGnuConfigScriptsHook, installShellFiles }: stdenv.mkDerivation rec { pname = "freesweep"; @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { hash = "sha256-iuu81yHbNrjdPsimBrPK58PJ0d8i3ySM7rFUG/d8NJM"; }; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook installShellFiles ]; buildInputs = [ ncurses ]; - preConfigure = '' - configureFlags="$configureFlags --with-prefsdir=$out/share" - ''; + configureFlags = [ "--with-prefsdir=$out/share" ]; enableParallelBuilding = true; @@ -25,7 +23,7 @@ stdenv.mkDerivation rec { runHook preInstall install -D -m 0555 freesweep $out/bin/freesweep install -D -m 0444 sweeprc $out/share/sweeprc - install -D -m 0444 freesweep.6 $out/share/man/man6/freesweep.6 + installManPage freesweep.6 runHook postInstall ''; diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 332db4a7a0fe..6d05cc48270f 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec { xorg.libX11 xorg.libXcursor xorg.libXi - xorg.libXi xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index 4b2509275269..c62fd3c5db72 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/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; [ - cc-by-sa-40 - ]; + license = licenses.cc-by-sa-40; maintainers = with maintainers; [ lux ]; platforms = platforms.linux; }; diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix new file mode 100644 index 000000000000..da0e6dbe7293 --- /dev/null +++ b/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; + }; +} diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 2257b50e0c8d..7523f2070e9a 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/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; [ - cc-by-sa-40 - ]; + license = licenses.cc-by-sa-40; maintainers = with maintainers; [ lux ]; platforms = platforms.linux; }; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 9b989ac70e05..440b30664d13 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchurl, nasm -, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib +{ lib, stdenv, fetchFromGitHub, nasm +, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libtheora, libvorbis, libGLU, libGL, SDL2, zlib , Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools }: stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.5.1"; + version = "2.6.1"; - src = fetchurl { - url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-n9jbOORFYUS/jDTazffyBOdfGOjkSOwBzgjOgmoDXwE="; + src = fetchFromGitHub { + owner = "scummvm"; + repo = "scummvm"; + rev = "v${version}"; + hash = "sha256-fqMMdHBVcXLsBDWxXH9UKXwfvlyIVbRsIPmrYqPGQ+g="; }; nativeBuildInputs = [ nasm ]; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ - curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU libGL SDL2 zlib + curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis libGLU libGL SDL2 zlib ]; dontDisableStatic = true; @@ -28,7 +30,6 @@ stdenv.mkDerivation rec { configurePlatforms = [ "host" ]; configureFlags = [ - "--enable-c++11" "--enable-release" ]; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 860c5a49ef86..9ce9ad3ffc5e 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trackballs"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "trackballs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fCoQqGXwcpcq/gl67XXY5/wEvCM0ZZTV8LhjC+tnRuo="; + sha256 = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index d16f3870d828..f38053a65a1d 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-5PuFq6wDSj5Ye2fUjqcr/VRU0ocus6h2nn+myQTOrhU="; + hash = "sha256-Ah+aAuU2ioUfvtxfcSb4GNqriqY71ee5RhW2L9UMYFY="; }; postPatch = '' |