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/arx-libertatis/default.nix8
-rw-r--r--pkgs/games/libremines/default.nix41
-rw-r--r--pkgs/games/minecraft-servers/versions.json26
-rw-r--r--pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch77
-rw-r--r--pkgs/games/scid-vs-pc/default.nix55
-rw-r--r--pkgs/games/steam/fhsenv.nix7
-rw-r--r--pkgs/games/xconq/default.nix10
7 files changed, 88 insertions, 136 deletions
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index edeacdec2a1..de597163a3d 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -10,15 +10,15 @@
 
 with lib;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "arx-libertatis";
-  version = "2020-10-20";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "arx";
     repo = "ArxLibertatis";
-    rev = "21df2e37664de79e117eff2af164873f05600f4c";
-    sha256 = "06plyyh0ddqv1j04m1vclz9j72609pgrp61v8wfjdcln8djm376i";
+    rev = version;
+    sha256 = "GBJcsibolZP3oVOTSaiVqG2nMmvXonKTp5i/0NNODKY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix
new file mode 100644
index 00000000000..5c949dbbe6a
--- /dev/null
+++ b/pkgs/games/libremines/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, wrapQtAppsHook
+, qtmultimedia
+, qtwayland
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libremines";
+  version = "1.9.1";
+
+  src = fetchFromGitHub {
+    owner = "Bollos00";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-CQE7fggRxFI/VatS7NMcIrC78tzqSwkkVC8gK9iKdVY=";
+  };
+
+  nativeBuildInputs = [ cmake wrapQtAppsHook ];
+
+  buildInputs = [
+    qtmultimedia
+  ] ++ lib.optionals stdenv.isLinux [
+    qtwayland
+  ];
+
+  cmakeFlags = [ "-DUSE_QT6=TRUE" ];
+
+  meta = with lib; {
+    description = "Qt based Minesweeper game";
+    longDescription = ''
+      A Free/Libre and Open Source Software Qt based Minesweeper game available for GNU/Linux, FreeBSD and Windows systems.
+    '';
+    homepage = "https://bollos00.github.io/LibreMines";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ aleksana ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json
index 34f1ccbc4a5..8c751bf7007 100644
--- a/pkgs/games/minecraft-servers/versions.json
+++ b/pkgs/games/minecraft-servers/versions.json
@@ -1,4 +1,10 @@
 {
+  "1.20": {
+    "url": "https://piston-data.mojang.com/v1/objects/15c777e2cfe0556eef19aab534b186c0c6f277e1/server.jar",
+    "sha1": "15c777e2cfe0556eef19aab534b186c0c6f277e1",
+    "version": "1.20",
+    "javaVersion": 17
+  },
   "1.19": {
     "url": "https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar",
     "sha1": "8f3112a1049751cc472ec13e397eade5336ca7ae",
@@ -6,61 +12,61 @@
     "javaVersion": 17
   },
   "1.18": {
-    "url": "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar",
     "sha1": "c8f83c5655308435b3dcf03c06d9fe8740a77469",
     "version": "1.18.2",
     "javaVersion": 17
   },
   "1.17": {
-    "url": "https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar",
     "sha1": "a16d67e5807f57fc4e550299cf20226194497dc2",
     "version": "1.17.1",
     "javaVersion": 16
   },
   "1.16": {
-    "url": "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar",
     "sha1": "1b557e7b033b583cd9f66746b7a9ab1ec1673ced",
     "version": "1.16.5",
     "javaVersion": 8
   },
   "1.15": {
-    "url": "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar",
     "sha1": "bb2b6b1aefcd70dfd1892149ac3a215f6c636b07",
     "version": "1.15.2",
     "javaVersion": 8
   },
   "1.14": {
-    "url": "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar",
     "sha1": "3dc3d84a581f14691199cf6831b71ed1296a9fdf",
     "version": "1.14.4",
     "javaVersion": 8
   },
   "1.13": {
-    "url": "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar",
     "sha1": "3737db93722a9e39eeada7c27e7aca28b144ffa7",
     "version": "1.13.2",
     "javaVersion": 8
   },
   "1.12": {
-    "url": "https://launcher.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar",
     "sha1": "886945bfb2b978778c3a0288fd7fab09d315b25f",
     "version": "1.12.2",
     "javaVersion": 8
   },
   "1.11": {
-    "url": "https://launcher.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar",
     "sha1": "f00c294a1576e03fddcac777c3cf4c7d404c4ba4",
     "version": "1.11.2",
     "javaVersion": 8
   },
   "1.10": {
-    "url": "https://launcher.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar",
     "sha1": "3d501b23df53c548254f5e3f66492d178a48db63",
     "version": "1.10.2",
     "javaVersion": 8
   },
   "1.9": {
-    "url": "https://launcher.mojang.com/v1/objects/edbb7b1758af33d365bf835eb9d13de005b1e274/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/edbb7b1758af33d365bf835eb9d13de005b1e274/server.jar",
     "sha1": "edbb7b1758af33d365bf835eb9d13de005b1e274",
     "version": "1.9.4",
     "javaVersion": 8
diff --git a/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch b/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch
deleted file mode 100644
index 63f31d7ef9e..00000000000
--- a/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 7e99cf4ae3f38406133a4abf962527cd02416f8e Mon Sep 17 00:00:00 2001
-From: Sebastian Galkin <paraseba@gmail.com>
-Date: Wed, 20 Dec 2017 18:23:03 -0200
-Subject: [PATCH] put fonts in $out
-
----
- Makefile.conf | 22 ++++------------------
- configure     | 12 ------------
- 2 files changed, 4 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile.conf b/Makefile.conf
-index e7f8de9..87f3fff 100644
---- a/Makefile.conf
-+++ b/Makefile.conf
-@@ -226,19 +226,11 @@ install_scid: all_scid
- 	fi
- 	install -m 755 -d $(SHAREDIR)/bitmaps
- 	cp -r ./bitmaps/* $(SHAREDIR)/bitmaps/
--	@if [ "`id -u`" -eq 0 ]; then \
--		install -m 755 -d $(FONTDIR); \
--		install -m 644 -p fonts/*.ttf $(FONTDIR); \
--	else \
--		install -m 755 -d ~/.fonts; \
--		install -m 644 -p fonts/*.ttf ~/.fonts; \
--	fi
-+	install -m 755 -d $(FONTDIR); \
-+	install -m 644 -p fonts/*.ttf $(FONTDIR); \
-+
- 	@if [ ! -z "`which fc-cache`" ]; then \
--		if [ "`id -u`" -eq 0 ]; then \
-- 			fc-cache -fv $(FONTDIR); \
--		else \
--			fc-cache -fv ~/.fonts; \
--		fi; \
-+ 		fc-cache -fv $(FONTDIR); \
- 	else \
- 		echo "Don't know how to setup truetype fonts (fc-cache not available)."; \
- 		echo "Please contact your system administrator."; \
-@@ -292,12 +284,6 @@ uninstall:
- 		for f in `ls fonts/*.ttf`; do \
- 			rm -f ~/.$$f; \
- 		done; \
--		if [ ! -z "`which fc-cache`" ]; then \
--			fc-cache -fv ~/.fonts; \
--		fi; \
--		if [ "`find ~/.fonts -type d -empty`" = "`ls -d ~/.fonts`" ]; then \
--			rmdir ~/.fonts; \
--		fi; \
- 	fi
- 
- clean:
-diff --git a/configure b/configure
-index 4599c77..8b09678 100755
---- a/configure
-+++ b/configure
-@@ -473,18 +473,6 @@ proc writeMakefile {{type ""}} {
-        exit 1
-     }
- 
--    if {[isDarwin]} {
--        set var(FONTDIR) /Library/Fonts/
--    } else {
--        # Just install fonts in to /usr irrespective of system prefix. /usr/local may not be active
--        set prefix /usr
--        if {![file isdirectory $prefix/share/fonts]} {
--            set var(FONTDIR) "~/.fonts"
--        } else {
--            set var(FONTDIR) $prefix/share/fonts/truetype/Scid
--        }
--    }
--
-     set line [gets $from]
-     while {1} {
-         set line [gets $from]
--- 
-2.15.1
-
diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix
index 63ffa4999e0..dc76a6149c9 100644
--- a/pkgs/games/scid-vs-pc/default.nix
+++ b/pkgs/games/scid-vs-pc/default.nix
@@ -1,59 +1,28 @@
-{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
+{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, which, makeDesktopItem }:
 
 tcl.mkTclDerivation rec {
   pname = "scid-vs-pc";
-  version = "4.22";
+  version = "4.24";
 
   src = fetchurl {
     url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz";
-    sha256 = "sha256-PSHDPrfhJI/DyEVQLo8Ckargqf/iUG5PgvUbO/4WNJM=";
+    hash = "sha256-x4Ljn1vaXrue16kUofWAH2sDNYC8h3NvzFjffRo0EhA=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ tk libX11 zlib ];
-
-  prePatch = ''
-    sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
-           -e '/^ *set libraryPath *{/a ${tcl}/lib ${tk}/lib' \
-           -e '/^ *set x11Path *{/a ${libX11}/lib/' \
-           configure
-
-    sed -i -e '/^ *set scidShareDir/s|\[file.*|"'"$out/share"'"|' \
-      tcl/config.tcl
+  postPatch = ''
+    substituteInPlace configure Makefile.conf \
+      --replace "~/.fonts" "$out/share/fonts/truetype/Scid" \
+      --replace "which fc-cache" "false"
   '';
 
-  # configureFlags = [
-  #   "BINDIR=$(out)/bin"
-  #   "SHAREDIR=$(out)/share"
-  #   "FONTDIR=$(out)/fonts"
-  # ];
-
-  preConfigure = ''configureFlags="
-    BINDIR=$out/bin
-    SHAREDIR=$out/share
-    FONTDIR=$out/fonts"
-  '';
+  nativeBuildInputs = [ makeWrapper which ];
+  buildInputs = [ tk libX11 zlib ];
 
-  patches = [
-    ./0001-put-fonts-in-out.patch
+  configureFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "SHAREDIR=${placeholder "out"}/share"
   ];
 
-  hardeningDisable = [ "format" ];
-
-  dontPatchShebangs = true;
-
-  # TODO: can this use tclWrapperArgs?
-  postFixup = ''
-    sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/scidpgn"
-    sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote"
-    sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid"
-
-    for cmd in $out/bin/* ; do
-      wrapProgram "$cmd" \
-        --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
-    done
-  '';
-
   postInstall = ''
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications/* $out/share/applications/
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index deca89e5010..9c47570b1dd 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -168,6 +168,13 @@ in buildFHSEnv rec {
     librsvg
     xorg.libXft
     libvdpau
+
+    # required by coreutils stuff to run correctly
+    # Steam ends up with LD_LIBRARY_PATH=<bunch of runtime stuff>:/usr/lib:<etc>
+    # which overrides DT_RUNPATH in our binaries, so it tries to dynload the
+    # very old versions of stuff from the runtime.
+    # FIXME: how do we even fix this correctly
+    attr
   ] ++ lib.optionals withGameSpecificLibraries [
     # Not formally in runtime but needed by some games
     at-spi2-atk
diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix
index ee6748676bd..78a7949d1a9 100644
--- a/pkgs/games/xconq/default.nix
+++ b/pkgs/games/xconq/default.nix
@@ -19,7 +19,13 @@ stdenv.mkDerivation rec {
     "--with-tkconfig=${tk}/lib"
   ];
 
-  CXXFLAGS = " --std=c++11 ";
+  env.CXXFLAGS = toString [
+    "-std=c++11"
+    "-DUSE_INTERP_RESULT"
+    "-Wno-writable-strings"
+  ];
+
+  enableParallelBuilding = true;
 
   hardeningDisable = [ "format" ];
 
@@ -49,7 +55,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A programmable turn-based strategy game";
     maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.gpl2;
   };
 }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-03 07:30:12 +0000