Merge remote-tracking branch 'NixOS/master' into staging

5 files changed, 48 insertions, 62 deletions

diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 04810f792e34..cb46b8d9ba27 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -2,9 +2,9 @@
 
 let
 
-  major = "2018";
-  minor = "11";
-  patch = "16";
+  major = "2019";
+  minor = "01";
+  patch = "19";
 
   version = "${major}.${minor}.${patch}";
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     owner = "daid";
     repo = "EmptyEpsilon";
     rev = "EE-${version}";
-    sha256 = "0848rxa9xwbz573b5r5qc5bpcf6pipis4gkkszfgkj1zmdhyib6b";
+    sha256 = "082v27w3n4jdm4a5884607rwsw4s00cnpqmh7bsdg9q3l29jpygn";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix
index 3b0aca6df285..edc73eeac922 100644
--- a/pkgs/games/linux-steam-integration/default.nix
+++ b/pkgs/games/linux-steam-integration/default.nix
@@ -1,34 +1,32 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, pkgs, gettext,
-  gcc_multi, libressl }:
+  gcc_multi, libressl, gnome3, steam }:
 
 let
-  version = "0.7.2";
-  steamBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ steam ])}/steam";
-  zenityBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ gnome3.zenity ])}/zenity";
+  version = "0.7.3";
 
 in stdenv.mkDerivation rec {
   name = "linux-steam-integration-${version}";
 
-  nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ];
-  buildInputs = [ gtk libressl ];
-
   src = fetchFromGitHub {
-    owner = "solus-project";
+    owner = "clearlinux";
     repo = "linux-steam-integration";
     rev = "v${version}";
-    sha256 = "0yn71fvjqi63dxk04jsndb26pgipl0nla10sy94bi7q95pk3sdf6";
+    sha256 = "0brv3swx8h170ycxksb31sf5jvj85csfpx7gjlf6yrfz7jw2j6vp";
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ];
+  buildInputs = [ gtk libressl ];
+
   # Patch lib paths (AUDIT_PATH and REDIRECT_PATH) in shim.c
   # Patch path to lsi-steam in lsi-steam.desktop
   # Patch path to zenity in lsi.c
   postPatch = ''
-    sed -i -e "s|/usr/|$out/|g" src/shim/shim.c
-    sed -i -e "s|/usr/|$out/|g" data/lsi-steam.desktop
-    sed -i -e "s|zenity|${zenityBinPath}|g" src/lsi/lsi.c
-    sed -i -e "s|Name=Linux Steam Integration|Name=Linux Steam Integration Settings|" data/lsi-settings.desktop.in
-
+    substituteInPlace src/shim/shim.c --replace "/usr/" $out
+    substituteInPlace data/lsi-steam.desktop --replace "/usr/" $out
+    substituteInPlace src/lsi/lsi.c --replace zenity ${gnome3.zenity}/bin/zenity
+    substituteInPlace data/lsi-settings.desktop.in \
+      --replace "Name=Linux Steam Integration" "Name=Linux Steam Integration Settings"
   '';
 
   configurePhase = ''
@@ -36,7 +34,7 @@ in stdenv.mkDerivation rec {
     meson build                           \
       -Dwith-shim=co-exist                \
       -Dwith-frontend=true                \
-      -Dwith-steam-binary=${steamBinPath} \
+      -Dwith-steam-binary=${steam}/bin/steam \
       -Dwith-new-libcxx-abi=true          \
       -Dwith-libressl-mode=native         \
       --prefix /                          \
@@ -74,7 +72,7 @@ in stdenv.mkDerivation rec {
       various workarounds to get games working, and fixes long standing bugs in
       both games and the client
     '';
-    homepage = https://github.com/solus-project/linux-steam-integration;
+    homepage = https://github.com/clearlinux/linux-steam-integration;
     license = licenses.lgpl21;
     maintainers = [ maintainers.etu ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
index fd662fe9743e..a03599b50895 100644
--- a/pkgs/games/openjk/default.nix
+++ b/pkgs/games/openjk/default.nix
@@ -20,13 +20,13 @@ let
     categories = "Game;";
   };
 in stdenv.mkDerivation rec {
-  name = "OpenJK-2017-08-11";
+  name = "OpenJK-2018-09-17";
 
   src = fetchFromGitHub {
     owner = "JACoders";
     repo = "OpenJK";
-    rev = "a0828f06e0181c62e110f2f78d30acb5036b4113";
-    sha256 = "1wbb643z2nyhyirzzy3rz03wjqglwmsgnj7w5cl8167f9f9j9w0m";
+    rev = "cc4094c8fa989663eb8087b33d97bb2749295b9f";
+    sha256 = "1fzijlf4izpm6n92cwv951c10nb18pg5zhc5xx7pw3i4sy8h9nyk";
   };
 
   dontAddPrefix = true;
diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix
index aba92ac087e8..a3ad0e637e5a 100644
--- a/pkgs/games/openmw/tes3mp.nix
+++ b/pkgs/games/openmw/tes3mp.nix
@@ -1,73 +1,59 @@
 { stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
-, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, libGL, terra }:
+, libXt, writeScriptBin, makeWrapper, ncurses, libGL, luajit }:
 
 let
-  mygui_ = mygui.override {
-    inherit stdenv;
-  };
-  terra_ = symlinkJoin {
-    name = "terra";
-    paths = [ terra.static terra.dev ];
-  };
+  version = "0.7.0-alpha";
   TES3MP = fetchFromGitHub {
     owner = "TES3MP";
     repo = "openmw-tes3mp";
-    rev = "f61664ff6d521e10db761a550c97c6edce8f0046";
-    sha256 = "12h01kafyzq0h1cgf1c8d4mlvlplg5lvcnsc5m5h602r763pzgbb";
+    rev = version;
+    sha256 = "012f50f9jd29qcdww2vk4habg6pmxvxl0q6rrjq8xchb0566712q";
   };
   CallFF = fetchFromGitHub {
     owner = "Koncord";
     repo = "CallFF";
-    rev = "4aa5a31b7543a8f784852a5a109202b2783e93d9";
-    sha256 = "0cf7r8hfh79bsg4p4k1iwhxapyakkvi0hcwwvzg1ln0fqm2yqp57";
+    rev = "da94b59ffe95d45bf98b9264e3d1279c9f6ebb6b";
+    sha256 = "10wgiqmknh0av968c6r74n5n2izxsx8qawfrab57kkmj9h0zp0pm";
   };
-  RakNet = fetchFromGitHub {
+  CrabNet = fetchFromGitHub {
     owner = "TES3MP";
-    repo = "RakNet";
-    rev = "9ace90a385f60e0b919bd84964a53fb1d42438ba";
-    sha256 = "0mkf5wx23w20fw9cmbiyfs86gmf0r11pdpd8y7qd4k4wl9c7n45q";
+    repo = "CrabNet";
+    rev = "ab1306050fe0f5b0f9c4f56893a79e56a9459567";
+    sha256 = "03q76pjv9mdi7w832b23q1mj4r2wb0hsnh4kpvwai607g04l0pp0";
   };
-  PluginExamples = fetchFromGitHub {
+  CoreScripts = fetchFromGitHub {
     owner = "TES3MP";
-    repo = "PluginExamples";
-    rev = "213e72f315a8029eec71437e56de0eaeba5b3670";
-    sha256 = "1q0cvz1s0zyq982066wgplnylqbiszz0bmcv2prqv78vq9is1l6b";
+    repo = "CoreScripts";
+    rev = "1e9f69f98051b2639b18203f989ffbd0a4b427ea";
+    sha256 = "03ysi7rh0k78kv4slvmkxpymxvdpr8b6hwr1lvjdgq7rq0ljy0lg";
   };
 
   fakegit = writeScriptBin "git" ''
     #! ${stdenv.shell}
-    if [ "$*" = "rev-list --tags --max-count=1" ] ||
-       [ "$*" = "rev-parse HEAD" ]; then
-      echo "${TES3MP.rev}"
-    else
-      exit 1
-    fi
   '';
 in stdenv.mkDerivation rec {
-  version = "0.6.0";
+  inherit version;
   name = "tes3mp-${version}";
 
   src = fetchFromGitHub {
     owner = "GrimKriegor";
     repo = "TES3MP-deploy";
-    rev = "ac2e862c3b96206d8e0678d422ece30f9f2d0f45";
-    sha256 = "0nysr6h7sa1j5ijyd52k6sw052vcdqdx4wjjmmy7p8wh1i0jkvv6";
+    rev = "1dd78a3e2cf9f4fe85bf7ca9c393251968a9c325";
+    sha256 = "1bp9c4kds9q0xhbn4sxb7n0f6rvb45gzx7ljdgc56wz4j5rfi3xn";
   };
 
   dontUseCmakeConfigure = true;
 
   nativeBuildInputs = [ cmake makeWrapper fakegit ];
-  buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt
-    ncurses libGL ];
+  buildInputs = [ boost ffmpeg qtbase bullet mygui openscenegraph SDL2 unshield openal libXt
+    ncurses libGL luajit ];
 
   buildPhase = ''
     mkdir dependencies keepers
     cp --no-preserve=mode -r ${TES3MP} code
-    mkdir code/.git
     cp --no-preserve=mode -r ${CallFF} dependencies/callff
-    cp --no-preserve=mode -r ${RakNet} dependencies/raknet
-    cp --no-preserve=mode -r ${PluginExamples} keepers/PluginExamples
-    ln -s ${terra_} dependencies/terra
+    cp --no-preserve=mode -r ${CrabNet} dependencies/raknet
+    cp --no-preserve=mode -r ${CoreScripts} keepers/CoreScripts
 
     substituteInPlace tes3mp-deploy.sh \
       --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out"
@@ -86,6 +72,8 @@ in stdenv.mkDerivation rec {
     mv build/resources $prefix/build
     mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw
     mv keepers $prefix
+    mv build/tes3mp-credits.md $prefix/build
+    mv -f $prefix/keepers/version $prefix/build/resources
 
     for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh
     do
@@ -100,8 +88,8 @@ in stdenv.mkDerivation rec {
     wrapProgram $out/bin/tes3mp-server \
       --run "mkdir -p ~/.config/openmw" \
       --run "cd ~/.config/openmw" \
-      --run "[ -d PluginExamples ] || cp --no-preserve=mode -r $prefix/keepers/PluginExamples ." \
-      --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/PluginExamples\" > tes3mp-server.cfg"
+      --run "[ -d CoreScripts ] || cp --no-preserve=mode -r $prefix/keepers/CoreScripts ." \
+      --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 6f69c6469503..4cd073869dc8 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "vkquake-${version}";
-  majorVersion = "1.00";
+  majorVersion = "1.01";
   version = "${majorVersion}.0";
 
   src = fetchFromGitHub {
     owner = "Novum";
     repo = "vkQuake";
     rev = version;
-    sha256 = "1h7ac5bh6h6cpvkx5bvp17lv5m24hmdykcdppkivblikpxhml70s";
+    sha256 = "1iwin8j5kbyrknbkhjgpy8nmm7pxqzr0daa9gn7p38qhg2mh0a39";
   };
 
   sourceRoot = "source/Quake";