diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/BeatSaberModManager/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/anki/bin.nix | 8 | ||||
-rw-r--r-- | pkgs/games/classicube/default.nix | 23 | ||||
-rw-r--r-- | pkgs/games/eduke32/default.nix | 20 | ||||
-rw-r--r-- | pkgs/games/globulation/default.nix | 18 | ||||
-rw-r--r-- | pkgs/games/itch/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/nanosaur/default.nix | 15 | ||||
-rw-r--r-- | pkgs/games/nanosaur2/default.nix | 15 | ||||
-rw-r--r-- | pkgs/games/osu-lazer/bin.nix (renamed from pkgs/games/osu-lazer-bin/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/games/otto-matic/default.nix | 17 | ||||
-rw-r--r-- | pkgs/games/quakespasm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/r2mod_cli/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/rare/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/solicurses/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/steam/default.nix | 14 | ||||
-rw-r--r-- | pkgs/games/the-legend-of-edgar/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/tintin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/vdrift/default.nix | 16 | ||||
-rw-r--r-- | pkgs/games/warzone2100/default.nix | 4 |
19 files changed, 103 insertions, 85 deletions
diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index ceef75f4585e..614733e549a8 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -1,7 +1,7 @@ { lib, dotnet-sdk, - targetPlatform, + stdenv, substituteAll, buildDotnetModule, @@ -34,7 +34,7 @@ buildDotnetModule rec { patches = [ (substituteAll { src = ./add-runtime-identifier.patch; - runtimeIdentifier = dotnetCorePackages.systemToDotnetRid targetPlatform.system; + runtimeIdentifier = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; }) ]; diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 82064325ab5f..9523a228f878 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.54"; + version = "2.1.56"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-NFhgVd4ctEsh7iaSZ9v0OMszd81H41eq+y+FRIhcCtE="; + sha256 = "sha256-bois8+W/Jvte0HqC6Vi8WcXzrc8y8fKoW3ttbPb/v14="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-kus59Z9Oe4sbAlF4szeg751hlSEUR0ijKz4rjfHEWgA="; + sha256 = "sha256-xd96wG+dElf6kSJ3jtdwfDhxJIv2r/o/JF2RcIwaZkg="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-ROIpGB3W21ttWj+cRkf0rpLFrO4LR6+ZyGRsalz5J+E="; + sha256 = "sha256-dYYgKEN6ytZ1CIH2+hK7H7xs3ISMbZGDv3w+Ie+ISlw="; }; }; diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index 05a5fa11931a..06c914e56f1b 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , dos2unix , makeWrapper +, makeDesktopItem +, copyDesktopItems , SDL2 , libGL , curl @@ -21,7 +23,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI="; }; - nativeBuildInputs = [ dos2unix makeWrapper ]; + nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = pname; + genericName = "Sandbox Block Game"; + exec = "ClassiCube"; + icon = "CCicon"; + comment = "Minecraft Classic inspired sandbox game"; + categories = [ "Game" ]; + }) + ]; prePatch = '' # The ClassiCube sources have DOS-style newlines @@ -64,6 +78,8 @@ stdenv.mkDerivation rec { postBuild = "cd -"; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp 'src/ClassiCube' "$out/bin" # ClassiCube puts downloaded resources @@ -75,6 +91,11 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/ClassiCube" \ --run 'mkdir -p "$HOME/.local/share/ClassiCube"' \ --run 'cd "$HOME/.local/share/ClassiCube"' + + mkdir -p "$out/share/icons/hicolor/256x256/apps" + cp misc/CCicon.png "$out/share/icons/hicolor/256x256/apps" + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index d5656d0d5c3b..a25c6fa9050f 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20221026"; - rev = "10165"; - revExtra = "a9c797dcb"; + version = "20221225"; + rev = "10166"; + revExtra = "122aee012"; src = fetchurl { url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "sha256-8xvIe+kVOu2VIZACHis04tvyrl1IRrt0tY8D04n6ZjU="; + sha256 = "sha256-3pBYZJqoH7XBkJ537wPwBSmNaZprvOlVtAKTo8EOT3Q="; }; buildInputs = [ @@ -48,7 +48,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = '' + substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ + --replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \ + --replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \ + --replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>' + '' + lib.optionalString stdenv.isLinux '' substituteInPlace source/build/src/glbuild.cpp \ --replace libGLU.so ${libGLU}/lib/libGLU.so @@ -56,11 +61,6 @@ in stdenv.mkDerivation rec { substituteInPlace source/glad/src/$f \ --replace libGL.so ${libGL}/lib/libGL.so done - - substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ - --replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \ - --replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \ - --replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>' ''; makeFlags = [ diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 9150541afd08..226e04aa1b73 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -24,6 +24,22 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/10_pthread_underlinkage.patch"; + sha256 = "sha256-L9POADlkgQbUQEUmx4s3dxXG9tS0w2IefpRGuQNRMI0="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/link-boost-system.patch"; + sha256 = "sha256-ne6F2ZowB+TUmg3ePuUoPNxXI0ZJC6HEol3oQQHJTy4="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/scons.patch"; + sha256 = "sha256-Gah7SoVcd/Aljs0Nqo3YF0lZImUWtrGM4HbbQ4yrhHU="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/boost-1.69.patch"; + sha256 = "sha256-D7agFR4uyIHxQz690Q8EHPF+rTEoiGUpgkm7r5cL5SI="; + }) ]; postPatch = '' @@ -32,7 +48,7 @@ stdenv.mkDerivation rec { sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct ''; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; + nativeBuildInputs = [ sconsPackages.scons_latest ]; buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; postConfigure = '' diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index 5776a1b43b2b..ca0a04a8492d 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -93,7 +93,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/itchio/itch"; license = licenses.mit; platforms = platforms.linux; - sourceProvenance = lib.sourceTypes.binaryBytecode; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; maintainers = with maintainers; [ pasqui23 ]; }; } diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index c62fd3c5db72..32c2a0b9ecc9 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -20,21 +20,12 @@ stdenv.mkDerivation rec { SDL2 ]; - configurePhase = '' - runHook preConfigure - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - cmake --build build - runHook postBuild - ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; installPhase = '' runHook preInstall - mv build $out + mkdir -p "$out/bin" + mv Nanosaur Data ReadMe.txt "$out/" makeWrapper $out/Nanosaur $out/bin/Nanosaur --chdir "$out" runHook postInstall ''; diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix index da0e6dbe7293..e4e0919cd30c 100644 --- a/pkgs/games/nanosaur2/default.nix +++ b/pkgs/games/nanosaur2/default.nix @@ -20,21 +20,12 @@ stdenv.mkDerivation rec { SDL2 ]; - configurePhase = '' - runHook preConfigure - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - cmake --build build - runHook postBuild - ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; installPhase = '' runHook preInstall - mv build $out + mkdir -p "$out/bin" + mv Nanosaur2 Data ReadMe.txt "$out/" makeWrapper $out/Nanosaur2 $out/bin/Nanosaur2 --chdir "$out" runHook postInstall ''; diff --git a/pkgs/games/osu-lazer-bin/default.nix b/pkgs/games/osu-lazer/bin.nix index 6ab5c4470106..d22d7fce171f 100644 --- a/pkgs/games/osu-lazer-bin/default.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -29,7 +29,9 @@ appimageTools.wrapType2 rec { cc-by-nc-40 unfreeRedistributable # osu-framework contains libbass.so in repository ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = [ maintainers.delan ]; + mainProgram = "osu!"; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 7523f2070e9a..17b63b263029 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -12,22 +12,23 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ - SDL2 - ]; - nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ + SDL2 + ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + installPhase = '' runHook preInstall - mkdir -p $out/share/OttoMatic - mv Data $out/share/OttoMatic - install -Dm755 {.,$out/bin}/OttoMatic - wrapProgram $out/bin/OttoMatic --chdir "$out/share/OttoMatic" + mkdir -p "$out/bin" + mv OttoMatic Data ReadMe.txt "$out/" + makeWrapper $out/OttoMatic $out/bin/OttoMatic --chdir "$out" runHook postInstall ''; diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 030532b524d7..6681370c79d6 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "quakespasm"; - version = "0.95.0"; + version = "0.95.1"; src = fetchurl { url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz"; - sha256 = "sha256-pjXqOyL5ILu0Tx5sfehYXbVsL11Abt9cgZJ4xkkBrnA="; + sha256 = "sha256-hBmEV3s65yQysMiq4zEP4swfCgCCiT5dzZdhg7bSNOI="; }; sourceRoot = "${pname}-${version}/Quake"; diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index eb1dd25811aa..b34159c3cd60 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -8,20 +8,20 @@ stdenv.mkDerivation rec { pname = "r2mod_cli"; - version = "1.2.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Foldex"; repo = "r2mod_cli"; rev = "v${version}"; - sha256 = "sha256-FS9P/uTZU4d6zpM3TlEW6i6PLGHxqqO2fc8D7VsPCig="; + sha256 = "sha256-WL6zF6EdGjNyOm0j4zYZ1Oe7StEttKFNO28Ne/dA7CQ="; }; buildInputs = [ bashInteractive ]; nativeBuildInputs = [ makeWrapper ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; postInstall = '' wrapProgram $out/bin/r2mod --prefix PATH : "${lib.makeBinPath [ jq p7zip ]}"; diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index fbd3f9512821..766673d3ea02 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -3,13 +3,13 @@ buildPythonApplication rec { pname = "rare"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "Dummerle"; repo = "Rare"; - rev = version; - sha256 = "sha256-M+OMsyamh4WHIx7Pv2sLylOrnSmYrv1aEm3atqXrDaw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-+STwVsDdvjP7HaqmaQVug+6h0n0rw/j4LGQQSNdLVQQ="; }; nativeBuildInputs = [ diff --git a/pkgs/games/solicurses/default.nix b/pkgs/games/solicurses/default.nix index a0c0263a5a30..3b0a60cb1e81 100644 --- a/pkgs/games/solicurses/default.nix +++ b/pkgs/games/solicurses/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation { cd build ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}c++" + ]; + installPhase = '' install -D SoliCurses.out $out/bin/solicurses ''; @@ -33,7 +37,5 @@ stdenv.mkDerivation { maintainers = with maintainers; [ laalsaas ]; license = licenses.gpl3Only; inherit (ncurses.meta) platforms; - # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 395980e8ee6f..9dfb239620e4 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,5 +1,4 @@ -{ lib, newScope, splicePackages, steamPackagesAttr ? "steamPackages" -, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget +{ makeScopeWithSplicing, generateSplicesForMkScope , stdenv, buildFHSUserEnv, pkgsi686Linux }: @@ -18,19 +17,12 @@ let glxinfo-i686 = pkgsi686Linux.glxinfo; steam-runtime-wrapped-i686 = if self.steamArch == "amd64" - then pkgsi686Linux.${steamPackagesAttr}.steam-runtime-wrapped + then pkgsi686Linux.steamPackages.steam-runtime-wrapped else null; inherit buildFHSUserEnv; }; steamcmd = callPackage ./steamcmd.nix { }; }; - otherSplices = { - selfBuildBuild = pkgsBuildBuild.${steamPackagesAttr}; - selfBuildHost = pkgsBuildHost.${steamPackagesAttr}; - selfBuildTarget = pkgsBuildTarget.${steamPackagesAttr}; - selfHostHost = pkgsHostHost.${steamPackagesAttr}; - selfTargetTarget = pkgsTargetTarget.${steamPackagesAttr} or {}; # might be missing; - }; keep = self: { }; extra = spliced0: { }; -in lib.makeScopeWithSplicing splicePackages newScope otherSplices keep extra steamPackagesFun +in makeScopeWithSplicing (generateSplicesForMkScope "steamPackages") keep extra steamPackagesFun diff --git a/pkgs/games/the-legend-of-edgar/default.nix b/pkgs/games/the-legend-of-edgar/default.nix index d099bbf2a420..1efc1c13554c 100644 --- a/pkgs/games/the-legend-of-edgar/default.nix +++ b/pkgs/games/the-legend-of-edgar/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { pname = "the-legend-of-edgar"; - version = "1.35"; + version = "1.36"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "riksweeney"; repo = "edgar"; rev = version; - hash = "sha256-ojy4nEW9KiSte/AoFUMPrKCxvIeQpMVIL4ileHiBydo="; + hash = "sha256-u2mg4hpcjPXzuZjYKIC4lgqGJPFRB9baHvaiu/YafZw="; }; nativeBuildInputs = [ diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 7add5af64fc7..e8917e2c5816 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tintin"; - version = "2.02.20"; + version = "2.02.30"; src = fetchFromGitHub { owner = "scandum"; repo = "tintin"; rev = version; - hash = "sha256-H9Cjg/GkyV50pgewv77zOJ8/Op78P9sQmZ5LorO4L+A="; + hash = "sha256-zZ7bajZURMuaTn7vhN5DF2HUfNVlDWnp71FXPCbidnM="; }; buildInputs = [ zlib pcre gnutls ] diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 19397794649b..d965faab4db2 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -16,12 +16,12 @@ , data ? fetchsvn { url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; - rev = "1386"; - sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1"; + rev = "1446"; + sha256 = "sha256-KEu49GAOfenPyuaUItt6W9pkuqUNpXgmTSFuc7ThljQ="; } }: let - version = "unstable-2017-12-09"; + version = "unstable-2021-09-05"; bin = stdenv.mkDerivation { pname = "vdrift"; inherit version; @@ -29,14 +29,16 @@ let src = fetchFromGitHub { owner = "vdrift"; repo = "vdrift"; - rev = "12d444ed18395be8827a21b96cc7974252fce6d1"; - sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; + rev = "7e9e00c8612b2014d491f026dd86b03f9fb04dcd"; + sha256 = "sha256-DrzRF4WzwEXCNALq0jz8nHWZ1oYTEsdrvSYVYI1WkTI="; }; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ]; buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; - patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; + patches = [ + ./0001-Ignore-missing-data-for-installation.patch + ]; buildPhase = '' sed -i -e s,/usr/local,$out, SConstruct diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 6307decb6a4d..26dfcdcfe77a 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-RcpHk+p9Adu9zkd2J54hspeolZr/xsBsY8eUHLGY0xw="; + sha256 = "sha256-PDy5mIYAoQ9VAJCTRMiBqUlRtKIqVHiMuBiozTtH5Z4="; }; buildInputs = [ |