summaryrefslogtreecommitdiffstats
path: root/pkgs/games
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/anki/bin.nix8
-rw-r--r--pkgs/games/classicube/default.nix23
-rw-r--r--pkgs/games/globulation/default.nix18
-rw-r--r--pkgs/games/itch/default.nix2
-rw-r--r--pkgs/games/osu-lazer/bin.nix (renamed from pkgs/games/osu-lazer-bin/default.nix)2
-rw-r--r--pkgs/games/r2mod_cli/default.nix6
-rw-r--r--pkgs/games/steam/default.nix14
-rw-r--r--pkgs/games/the-legend-of-edgar/default.nix4
-rw-r--r--pkgs/games/vdrift/default.nix16
-rw-r--r--pkgs/games/warzone2100/default.nix4
10 files changed, 65 insertions, 32 deletions
diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix
index 82064325ab5f..cdec20572bd9 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.55";
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-fi7efWBZZnqOEztVOhOsfspcTBDxqw2Rr/eAGMFYbAU=";
};
# 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-+Ceo03bMNnDQWgDmF1MIlrTQyHaJUKG8gF1/+ZEFCYw=";
};
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-3ppE+APPUJ6H/ud67KNwfQJnFCa7g7Hdxx4oZD0ip6E=";
};
};
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/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/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/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/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/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 = [
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-14 19:42:50 +0000