about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/blightmud/default.nix73
-rw-r--r--pkgs/games/fheroes2/default.nix4
-rw-r--r--pkgs/games/freeciv/default.nix4
-rw-r--r--pkgs/games/gemrb/default.nix4
-rw-r--r--pkgs/games/gogdl/default.nix6
-rw-r--r--pkgs/games/grapejuice/default.nix4
-rw-r--r--pkgs/games/jumpy/default.nix7
-rw-r--r--pkgs/games/polymc/default.nix75
-rw-r--r--pkgs/games/prismlauncher/default.nix94
-rw-r--r--pkgs/games/shticker-book-unwritten/unwrapped.nix6
-rw-r--r--pkgs/games/solicurses/default.nix37
-rw-r--r--pkgs/games/steam/fhsenv.nix5
-rw-r--r--pkgs/games/unciv/default.nix4
-rw-r--r--pkgs/games/vintagestory/default.nix4
-rw-r--r--pkgs/games/wesnoth/default.nix4
-rw-r--r--pkgs/games/zod/default.nix8
16 files changed, 194 insertions, 145 deletions
diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix
index 32c9ddb653472..1937f84f88f7a 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/games/blightmud/default.nix
@@ -1,5 +1,13 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, alsa-lib, openssl
-, withTTS ? false, llvmPackages, speechd }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, alsa-lib
+, openssl
+, withTTS ? false
+, speechd
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "blightmud";
@@ -16,50 +24,29 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = lib.optional withTTS "tts";
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
 
   buildInputs = [ alsa-lib openssl ] ++ lib.optional withTTS [ speechd ];
 
-  # Building the speech-dispatcher-sys crate for TTS support requires setting
-  # LIBCLANG_PATH.
-  LIBCLANG_PATH = lib.optionalString withTTS "${llvmPackages.libclang.lib}/lib";
-
-  preBuild = lib.optionalString withTTS ''
-    # When building w/ TTS the speech-dispatcher-sys crate's build.rs uses
-    # rust-bindgen with libspeechd. This bypasses the normal nixpkgs CC wrapper
-    # so we have to adapt the BINDGEN_EXTRA_CLANG_ARGS env var to compensate. See
-    # this blog post[0] for more information.
-    #
-    # [0]: https://hoverbear.org/blog/rust-bindgen-in-nix/
-
-    export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \
-      $(< ${stdenv.cc}/nix-support/cc-cflags) \
-      -isystem ${llvmPackages.libclang.lib}/lib/clang/${
-        lib.getVersion llvmPackages.clang
-      }/include \
-      -idirafter ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${
-        lib.getVersion stdenv.cc.cc
-      }/include \
-      -idirafter ${speechd}/include"
-  '';
-
-  checkFlags = let
-    # Most of Blightmud's unit tests pass without trouble in the isolated
-    # Nixpkgs build env. The following tests need to be skipped.
-    skipList = [
-      "test_connect"
-      "test_gmcp_negotiation"
-      "test_ttype_negotiation"
-      "test_reconnect"
-      "test_is_connected"
-      "test_mud"
-      "test_server"
-      "test_lua_script"
-      "timer_test"
-      "validate_assertion_fail"
-    ];
-    skipFlag = test: "--skip " + test;
-  in builtins.concatStringsSep " " (builtins.map skipFlag skipList);
+  checkFlags =
+    let
+      # Most of Blightmud's unit tests pass without trouble in the isolated
+      # Nixpkgs build env. The following tests need to be skipped.
+      skipList = [
+        "test_connect"
+        "test_gmcp_negotiation"
+        "test_ttype_negotiation"
+        "test_reconnect"
+        "test_is_connected"
+        "test_mud"
+        "test_server"
+        "test_lua_script"
+        "timer_test"
+        "validate_assertion_fail"
+      ];
+      skipFlag = test: "--skip " + test;
+    in
+    builtins.concatStringsSep " " (builtins.map skipFlag skipList);
 
   meta = with lib; {
     description = "A terminal MUD client written in Rust";
diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix
index 673c7d3e6d376..5f3bb86d51d79 100644
--- a/pkgs/games/fheroes2/default.nix
+++ b/pkgs/games/fheroes2/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fheroes2";
-  version = "0.9.19";
+  version = "0.9.20";
 
   src = fetchFromGitHub {
     owner = "ihhub";
     repo = "fheroes2";
     rev = version;
-    sha256 = "sha256-GLF5OXPEc1V1r9INbEdIM17tm7pKq1ZuOuShtAnqXjM=";
+    sha256 = "sha256-IF8ESbMDvermghBGLMq+GdE67Hg5XedX0REGGnWQhRA=";
   };
 
   buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index abe8aff15806a..2edecbf9ae5c5 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "freeciv";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "freeciv";
     repo = "freeciv";
     rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-WIp1R27UahbkLZZuF0nbX/XHVDc2OJukPKgoQ+qnjMc=";
+    sha256 = "sha256-hhX+aM/NHdqOM0qSKSJyW2FAWTsyAHrjaNhxtP2vbVA=";
   };
 
   postPatch = ''
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index 583c6ba902263..66b6faa325521 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gemrb";
-  version = "0.9.1";
+  version = "0.9.1.1";
 
   src = fetchFromGitHub {
     owner = "gemrb";
     repo = "gemrb";
     rev = "v${version}";
-    hash = "sha256-xc59Iyrmbmo7Kxio0lLpvVlpdoeM/vfmBLkJdzJsSPY=";
+    hash = "sha256-pC83LgAy1aQxUhS2qa57hm03B37bj6dcRVRn7SI5I+k=";
   };
 
   buildInputs = [
diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix
index 2b250aeddf5ee..944902bcadc38 100644
--- a/pkgs/games/gogdl/default.nix
+++ b/pkgs/games/gogdl/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonApplication rec {
   pname = "gogdl";
-  version = "0.3";
+  version = "0.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "heroic-gogdl";
-    rev = "v${version}";
-    sha256 = "sha256-lVNvmdUK7rjSNVdhDuSxyfuEw2FeZt0rVf9pdtsfgqE=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-4hWuGd0Alzd/ZqtN4zG2aid6C9lnT3Ihrrsjfg9PEYA=";
   };
 
   disabled = pythonOlder "3.8";
diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix
index 8f621ff7fe485..f58596fccc129 100644
--- a/pkgs/games/grapejuice/default.nix
+++ b/pkgs/games/grapejuice/default.nix
@@ -18,13 +18,13 @@
 
 python3Packages.buildPythonApplication rec  {
   pname = "grapejuice";
-  version = "5.5.4";
+  version = "6.2.2";
 
   src = fetchFromGitLab {
     owner = "BrinkerVII";
     repo = "grapejuice";
     rev = "v${version}";
-    sha256 = "sha256-y4J0589FgNahRmoPkVtHYtc6/OIfUi9bhz6BZrSeWVI=";
+    sha256 = "sha256-wwM3q8Z4bYZod7/KcGc/PXlyLQxLRPkF1TdtFcg8mNE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix
index 2afba817fc004..645069e4354d3 100644
--- a/pkgs/games/jumpy/default.nix
+++ b/pkgs/games/jumpy/default.nix
@@ -5,8 +5,7 @@
 , pkg-config
 , alsa-lib
 , libGL
-, libX11
-, libXi
+, xorg
 , udev
 , Cocoa
 , OpenGL
@@ -32,8 +31,8 @@ rustPlatform.buildRustPackage rec {
   buildInputs = lib.optionals stdenv.isLinux [
     alsa-lib
     libGL
-    libX11
-    libXi
+    xorg.libX11
+    xorg.libXi
     udev
   ] ++ lib.optionals stdenv.isDarwin [
     Cocoa
diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix
deleted file mode 100644
index 1a98ca7960105..0000000000000
--- a/pkgs/games/polymc/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, jdk8
-, jdk
-, zlib
-, file
-, wrapQtAppsHook
-, xorg
-, libpulseaudio
-, qtbase
-, libGL
-, quazip
-, glfw
-, openal
-, msaClientID ? ""
-, jdks ? [ jdk jdk8 ]
-, extra-cmake-modules
-}:
-
-stdenv.mkDerivation rec {
-  pname = "polymc";
-  version = "1.4.2";
-
-  src = fetchFromGitHub {
-    owner = "PolyMC";
-    repo = "PolyMC";
-    rev = version;
-    sha256 = "sha256-mqLk7ZcSrtvlUziNUCtnH7xQplXBruuiuN2b1+VX1ng=";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ];
-  buildInputs = [ qtbase zlib quazip ];
-
-  cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
-
-  dontWrapQtApps = true;
-
-  postInstall = let
-    libpath = with xorg; lib.makeLibraryPath [
-      libX11
-      libXext
-      libXcursor
-      libXrandr
-      libXxf86vm
-      libpulseaudio
-      libGL
-      glfw
-      openal
-      stdenv.cc.cc.lib
-    ];
-  in ''
-    # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-    wrapQtApp $out/bin/polymc \
-      --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
-      --prefix POLYMC_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \
-      --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}
-  '';
-
-  meta = with lib; {
-    homepage = "https://polymc.org/";
-    description = "A free, open source launcher for Minecraft";
-    longDescription = ''
-      Allows you to have multiple, separate instances of Minecraft (each with
-      their own mods, texture packs, saves, etc) and helps you manage them and
-      their associated options with a simple interface.
-    '';
-    platforms = platforms.linux;
-    changelog = "https://github.com/PolyMC/PolyMC/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ cleverca22 starcraft66 ];
-  };
-}
diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix
new file mode 100644
index 0000000000000..a7797861f30ab
--- /dev/null
+++ b/pkgs/games/prismlauncher/default.nix
@@ -0,0 +1,94 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, jdk8
+, jdk
+, zlib
+, file
+, wrapQtAppsHook
+, xorg
+, libpulseaudio
+, qtbase
+, libGL
+, quazip
+, glfw
+, openal
+, extra-cmake-modules
+, tomlplusplus
+, ghc_filesystem
+, msaClientID ? ""
+, jdks ? [ jdk jdk8 ]
+,
+}:
+let
+  libnbtplusplus = fetchFromGitHub {
+    owner = "PrismLauncher";
+    repo = "libnbtplusplus";
+    rev = "2203af7eeb48c45398139b583615134efd8d407f";
+    sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=";
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "prismlauncher";
+  version = "5.0";
+
+  src = fetchFromGitHub {
+    owner = "PrismLauncher";
+    repo = "PrismLauncher";
+    rev = version;
+    sha256 = "sha256-oN+DpJ08N/ar5wLAahgpBV9DeHtMTwSrE7uOwT3A+Yo=";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules ghc_filesystem cmake file jdk wrapQtAppsHook ];
+  buildInputs = [ qtbase zlib quazip tomlplusplus ];
+
+  cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
+  dontWrapQtApps = true;
+
+  postUnpack = ''
+    rm -rf source/libraries/libnbtplusplus
+    mkdir source/libraries/libnbtplusplus
+    ln -s ${libnbtplusplus}/* source/libraries/libnbtplusplus
+    chmod -R +r+w source/libraries/libnbtplusplus
+    chown -R $USER: source/libraries/libnbtplusplus
+  '';
+
+  postInstall =
+    let
+      libpath = with xorg;
+        lib.makeLibraryPath [
+          libX11
+          libXext
+          libXcursor
+          libXrandr
+          libXxf86vm
+          libpulseaudio
+          libGL
+          glfw
+          openal
+          stdenv.cc.cc.lib
+        ];
+    in
+    ''
+      # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+      wrapQtApp $out/bin/prismlauncher \
+        --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
+        --prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \
+        --prefix PATH : ${lib.makeBinPath [xorg.xrandr]}
+    '';
+
+  meta = with lib; {
+    homepage = "https://prismlauncher.org/";
+    description = "A free, open source launcher for Minecraft";
+    longDescription = ''
+      Allows you to have multiple, separate instances of Minecraft (each with
+      their own mods, texture packs, saves, etc) and helps you manage them and
+      their associated options with a simple interface.
+    '';
+    platforms = platforms.linux;
+    changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${version}";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ minion3665 Scrumplex ];
+  };
+}
diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/games/shticker-book-unwritten/unwrapped.nix
index a4b25d94e8f8d..1d49a220235f5 100644
--- a/pkgs/games/shticker-book-unwritten/unwrapped.nix
+++ b/pkgs/games/shticker-book-unwritten/unwrapped.nix
@@ -2,15 +2,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "shticker-book-unwritten";
-  version = "1.0.3";
+  version = "1.2.0";
 
   src = fetchCrate {
     inherit version;
     crateName = "shticker_book_unwritten";
-    sha256 = "sha256-NQEXLTtotrZQmoYQnhCHIEwSe+fqlcHq5/I6zTHwLvc=";
+    sha256 = "sha256-jI2uL8tMUmjZ5jPkCV2jb98qtKwi9Ti4NVCPfuO3iB4=";
   };
 
-  cargoSha256 = "sha256-SniyLp/4R0MkJYQmW3RFvOFeBKTvRlSzEI5Y+ELHfy8=";
+  cargoSha256 = "sha256-Tney9SG9MZh7AUIT1h/dlgJyRrSPX7mUhfsKD1Rfsfc=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/games/solicurses/default.nix b/pkgs/games/solicurses/default.nix
new file mode 100644
index 0000000000000..2a296b525f522
--- /dev/null
+++ b/pkgs/games/solicurses/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, ncurses
+}:
+
+stdenv.mkDerivation {
+  pname = "solicurses";
+  version = "unstable-2020-02-13";
+
+  src = fetchFromGitHub {
+    owner = "KaylaPP";
+    repo = "SoliCurses";
+    rev = "dc89ca00fc1711dc449d0a594a4727af22fc35a0";
+    sha256 = "sha256-zWYXpvEnViT/8gsdMU9Ymi4Hw+nwkG6FT/3h5sNMCE4=";
+  };
+
+  buildInputs = [
+    ncurses
+  ];
+
+  preBuild = ''
+    cd build
+  '';
+
+  installPhase = ''
+    install -D SoliCurses.out $out/bin/solicurses
+  '';
+
+  meta = with lib; {
+    description = "A version of Solitaire written in C++ using the ncurses library";
+    homepage = "https://github.com/KaylaPP/SoliCurses";
+    maintainers = with maintainers; [ laalsaas ];
+    license = licenses.gpl3Only;
+    inherit (ncurses.meta) platforms;
+  };
+}
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index 8ad1600701d5a..ea9db37cbddfa 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -294,5 +294,10 @@ in buildFHSUserEnv rec {
       ${fixBootstrap}
       exec -- "$run" "$@"
     '';
+
+    meta = steam.meta // {
+      description = "Run commands in the same FHS environment that is used for Steam";
+      name = "steam-run";
+    };
   };
 }
diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix
index f61e67635903c..d27f468a53ad1 100644
--- a/pkgs/games/unciv/default.nix
+++ b/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "unciv";
-  version = "4.2.11";
+  version = "4.2.13";
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    sha256 = "sha256-bA1rz4PvpcdMSGob+KIdSpyq6ePlLj8l61r0+XclfZY=";
+    sha256 = "sha256-xYYuToo+19qaVyWFKrgjsqVs78rHdX/hyZ/nXYlPFMU=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix
index 4c94fa4f1ae3b..5e7af156c48da 100644
--- a/pkgs/games/vintagestory/default.nix
+++ b/pkgs/games/vintagestory/default.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vintagestory";
-  version = "1.16.5";
+  version = "1.17.4";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
-    sha256 = "sha256-qqrQ+cs/ujzeXAa0xX5Yee3l5bo9DaH+kS1pkCt/UoU=";
+    sha256 = "sha256-q4SphwL4g1hyMMthhF7VCfRqlJrOp8uk00fPRqCfI/s=";
   };
 
   nativeBuildInputs = [ makeWrapper copyDesktopItems ];
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index b6ee5ac7d7b20..a98e695950bb5 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.16.5";
+  version = "1.16.6";
 
   src = fetchFromGitHub {
     rev = version;
     owner = "wesnoth";
     repo = "wesnoth";
-    sha256 = "sha256-U01dMrbPRBliag/RKnwG1G2YEv7fiTh6+S+S5cO1Fx8=";
+    sha256 = "sha256-oQRjVjVjLIvCCafLr0FXvLwnKDjJY2FU20dYGLtNFiU=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index ad576b4642436..737fed1e7f64d 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -7,7 +7,7 @@
 , SDL_ttf
 , SDL_mixer
 , libmysqlclient
-, wxGTK
+, wxGTK32
 , symlinkJoin
 , runCommandLocal
 , makeWrapper
@@ -31,7 +31,7 @@ let
     SDL_ttf
     SDL_mixer
     libmysqlclient
-    wxGTK
+    wxGTK32
     coreutils
   ];
   hardeningDisable = [ "format" ];
@@ -74,7 +74,8 @@ let
       ];
       postPatch = ''
         substituteInPlace zod_launcher_src/zod_launcherFrm.cpp \
-          --replace 'message = wxT("./zod");' 'message = wxT("zod");'
+          --replace 'message = wxT("./zod");' 'message = wxT("zod");' \
+          --replace "check.replace(i,1,1,'_');" "check.replace(i,1,1,(wxUniChar)'_');"
       '';
       preBuild = "cd zod_launcher_src";
       installPhase = ''
@@ -106,5 +107,6 @@ in
       homepage = "http://zod.sourceforge.net/";
       maintainers = with maintainers; [ zeri ];
       license = licenses.gpl3Plus; /* Says the website */
+      platforms = platforms.linux;
     };
   }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-05 08:00:09 +0000