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/astromenace/default.nix2
-rw-r--r--pkgs/games/ball-and-paddle/default.nix2
-rw-r--r--pkgs/games/chocolate-doom/default.nix1
-rw-r--r--pkgs/games/exult/default.nix1
-rw-r--r--pkgs/games/freeciv/default.nix1
-rw-r--r--pkgs/games/freedink/default.nix1
-rw-r--r--pkgs/games/ivan/default.nix4
-rw-r--r--pkgs/games/lbreakout2/default.nix1
-rw-r--r--pkgs/games/multimc/default.nix14
-rw-r--r--pkgs/games/openxcom/default.nix2
-rw-r--r--pkgs/games/unvanquished/default.nix69
11 files changed, 22 insertions, 76 deletions
diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix
index 737f31d6e105b..91959a1c942b1 100644
--- a/pkgs/games/astromenace/default.nix
+++ b/pkgs/games/astromenace/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Hardcore 3D space shooter with spaceship upgrade possibilities";
-    homepage = http://www.viewizard.com/;
+    homepage = https://www.viewizard.com/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix
index dbd2814a6fb61..1391ca70223a3 100644
--- a/pkgs/games/ball-and-paddle/default.nix
+++ b/pkgs/games/ball-and-paddle/default.nix
@@ -38,5 +38,7 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
 
     platforms = stdenv.lib.platforms.unix;
+
+    hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin
   };
 }
diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix
index 37176750763fd..56a926e63f6d0 100644
--- a/pkgs/games/chocolate-doom/default.nix
+++ b/pkgs/games/chocolate-doom/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
   };
 }
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index 28d273ad5cc42..2fe76649d5520 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
     description = "A reimplementation of the Ultima VII game engine";
     maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out
   };
 }
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index ee93d162396d3..8003468f50fa0 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -51,5 +51,6 @@ stdenv.mkDerivation {
 
     maintainers = with maintainers; [ pierron ];
     platforms = platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin
   };
 }
diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix
index c1bfda9e2f2f3..d5efe2b3ebd96 100644
--- a/pkgs/games/freedink/default.nix
+++ b/pkgs/games/freedink/default.nix
@@ -54,5 +54,6 @@ in stdenv.mkDerivation rec {
 
     maintainers = [ stdenv.lib.maintainers.bjg ];
     platforms = stdenv.lib.platforms.all;
+    hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin
   };
 }
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 50b9f03d4bc92..3431be5359eaa 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "ivan-${version}";
-  version = "052";
+  version = "053";
 
   src = fetchFromGitHub {
     owner = "Attnam";
     repo = "ivan";
     rev = "v${version}";
-    sha256 = "1vvwb33jw4ppwsqlvaxq3b8npdzh9j9jfangyzszp5sfnnd7fj5b";
+    sha256 = "1r3fcccgpjmzzkg0lfmq76igjapr01kh97vz671z60jg7gyh301b";
   };
 
   buildInputs = [SDL2 SDL2_mixer libpng pcre];
diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
index 5ab9954739b2a..b5f858b99ad79 100644
--- a/pkgs/games/lbreakout2/default.nix
+++ b/pkgs/games/lbreakout2/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.ciil ];
     platforms = platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin
   };
 }
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index c6697f5806d45..6be5c9ee2474c 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -4,12 +4,14 @@ let
   libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
 in stdenv.mkDerivation rec {
   name = "multimc-${version}";
-  version = "0.6.2";
+  # Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see
+  # https://github.com/NixOS/nixpkgs/issues/42387
+  version = "unstable-2018-06-04";
   src = fetchFromGitHub {
     owner = "MultiMC";
     repo = "MultiMC5";
-    rev = version;
-    sha256 = "07jrr6si8nzfqwf073zhgw47y6snib23ad3imh1ik1nn5r7wqy3c";
+    rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071";
+    sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [ cmake file makeWrapper ];
@@ -22,6 +24,12 @@ in stdenv.mkDerivation rec {
     cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps
     cp ../application/package/linux/multimc.desktop $out/share/applications
     wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/
+
+    # As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop,
+    # the desktop icon refers to `multimc`, but the executable actually gets
+    # installed as `MultiMC`. Create compatibility symlink to fix the desktop
+    # icon.
+    ln -sf $out/bin/MultiMC $out/bin/multimc
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 30470e98c58d0..a936ca134122a 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Open source clone of UFO: Enemy Unknown";
-    homepage = http://openxcom.org;
+    homepage = https://openxcom.org;
     repositories.git = https://github.com/SupSuper/OpenXcom.git;
     maintainers = [ stdenv.lib.maintainers.cpages ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix
deleted file mode 100644
index 5ea84b9ef41f9..0000000000000
--- a/pkgs/games/unvanquished/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, cmake, libGLU_combined, SDL, libjpeg, libpng, glew, libwebp, ncurses
-, gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore
-, makeWrapper }:
-stdenv.mkDerivation rec {
-  name = "unvanquished-${version}";
-  version = "0.13.1";
-  src = fetchurl {
-    url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz";
-    sha256 = "1k7mlpwalimn6xb2s760f124xncpg455qvls6z3x0ii5x0wc1mp2";
-  };
-  buildInputs = [ cmake libGLU_combined SDL libjpeg libpng glew libwebp ncurses gmp curl
-                  nettle openal speex libogg libvorbis libtheora xvidcore 
-                  makeWrapper ];
-  preConfigure = ''prefix="$prefix/opt"'';
-  postInstall = ''
-    # cp -r ../main "$prefix/Unvanquished/"
-    mkdir -p "$out/bin"
-    substituteInPlace download-pk3.sh --replace /bin/bash ${stdenv.shell}
-    cp -v download-pk3.sh "$out/bin/unvanquished-download-pk3"
-    makeWrapper "$prefix/Unvanquished/daemon" "$out/bin/unvanquished" \
-                --run '[ -f ~/.Unvanquished/main/md5sums ] &&
-                       cd ~/.Unvanquished/main/ &&
-                       md5sum --quiet -c md5sums ||
-                       unvanquished-download-pk3' \
-                --run "cd '$prefix/Unvanquished'"
-    makeWrapper "$prefix/Unvanquished/daemonded" "$out/bin/unvanquished-ded" \
-                --run '[ -f ~/.Unvanquished/main/md5sums ] &&
-                       cd ~/.Unvanquished/main/ &&
-                       md5sum --quiet -c md5sums ||
-                       unvanquished-download-pk3' \
-                --run "cd '$prefix/Unvanquished'"
-  '';
-
-  meta = {
-    description = "FPS game set in a futuristic, sci-fi setting";
-    longDescription = ''
-      Unvanquished is a free, open-source first-person shooter
-      combining real-time strategy elements with a futuristic, sci-fi
-      setting. It is available for Windows, Linux, and macOS.
-
-      Features:
-
-      * Two teams
-        Play as either the technologically advanced humans or the highly
-        adaptable aliens, with a fresh gameplay experience on both
-        sides.
-
-      * Build a base
-        Construct and maintain your base with a variety of useful
-        structures, or group up with teammates to take on the other
-        team.
-
-      * Level up
-        Earn rewards for victories against the other team, whether it's
-        a deadly new weapon or access to a whole new alien form.
-
-      * Customize
-        Compatibility with Quake 3 file formats and modification tools
-        allows for extensive customization of the game and its
-        setting.
-    '';
-    homepage = http://unvanquished.net;
-    #license = "unknown";
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
-    # This package can take a lot of disk space, so unavailable from channel
-    hydraPlatforms = [];
-  };
-}
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-10-06 00:40:22 +0000