Merge master into staging-next

2 files changed, 0 insertions, 115 deletions

diff --git a/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch b/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch
deleted file mode 100644
index e21b53b3cc536..0000000000000
--- a/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp
---- a/src/core/gui/irc/ircdock.cpp	Tue Mar 06 00:14:23 2018 +0100
-+++ b/src/core/gui/irc/ircdock.cpp	Sat Jul 28 16:53:04 2018 -0700
-@@ -32,6 +32,7 @@
- #include <QInputDialog>
- #include <QMessageBox>
- #include <QToolBar>
-+#include <QTabBar>
- 
- DClass<IRCDock> : public Ui::IRCDock
- {
-diff -r c2c7f37b1afb src/core/gui/logdock.cpp
---- a/src/core/gui/logdock.cpp	Tue Mar 06 00:14:23 2018 +0100
-+++ b/src/core/gui/logdock.cpp	Sat Jul 28 16:53:04 2018 -0700
-@@ -21,6 +21,8 @@
- // Copyright (C) 2009 "Zalewa" <zalewapl@gmail.com>
- //------------------------------------------------------------------------------
- 
-+#include <QAction>
-+
- #include "clipboard.h"
- #include "logdock.h"
- #include "log.h"
-diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp
---- a/src/core/gui/serverdetailsdock.cpp	Tue Mar 06 00:14:23 2018 +0100
-+++ b/src/core/gui/serverdetailsdock.cpp	Sat Jul 28 16:53:04 2018 -0700
-@@ -21,6 +21,7 @@
- // Copyright (C) 2014 Braden "Blzut3" Obrzut <admin@maniacsvault.net>
- //------------------------------------------------------------------------------
- 
-+#include <QAction>
- #include <QBoxLayout>
- 
- #include "serverdetailsdock.h"
-diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp
---- a/src/core/gui/serverfilterdock.cpp	Tue Mar 06 00:14:23 2018 +0100
-+++ b/src/core/gui/serverfilterdock.cpp	Sat Jul 28 16:53:04 2018 -0700
-@@ -20,6 +20,9 @@
- //------------------------------------------------------------------------------
- // Copyright (C) 2011 "Zalewa" <zalewapl@gmail.com>
- //------------------------------------------------------------------------------
-+
-+#include <QAction>
-+
- #include "serverfilterdock.h"
- #include "ui_serverfilterdock.h"
- 
diff --git a/pkgs/games/nxengine-evo/default.nix b/pkgs/games/nxengine-evo/default.nix
deleted file mode 100644
index ca57d11910aa6..0000000000000
--- a/pkgs/games/nxengine-evo/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib, stdenv
-, fetchpatch
-, fetchurl
-, fetchFromGitHub
-, cmake
-, libpng
-, SDL2
-, SDL2_mixer
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nxengine-evo";
-  version = "2.6.4";
-  src = fetchFromGitHub {
-    owner = "nxengine";
-    repo = "nxengine-evo";
-    rev = "v${version}";
-    sha256 = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A=";
-  };
-  assets = fetchurl {
-    url = "https://github.com/nxengine/nxengine-evo/releases/download/v${version}/NXEngine-v${version}-Linux.tar.xz";
-    sha256 = "1b5hkmsrrhnjjf825ri6n62kb3fldwl7v5f1cqvqyv47zv15g5gy";
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch";
-      sha256 = "18j22vzkikcwqd42vlhzd6rjp26dq0zslxw5yyl07flivms0hny2";
-    })
-    (fetchpatch {
-      url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch";
-      sha256 = "0sjr7z63gp7nfxifxisvp2w664mxxk3xi4a3d86mm0470dj5m5bx";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [
-    libpng
-    SDL2
-    SDL2_mixer
-  ];
-
-  # Allow finding game assets.
-  postPatch = ''
-    sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp
-  '';
-
-  installPhase = ''
-    cd ..
-    unpackFile ${assets}
-    mkdir -p $out/bin/ $out/share/nxengine/
-    install bin/* $out/bin/
-    cp -r NXEngine-evo-${version}-Linux/data/ $out/share/nxengine/data
-    chmod -R a=r,a+X $out/share/nxengine/data
-  '';
-
-  meta = {
-    description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)";
-    license = with lib.licenses; [
-      gpl3                   # Game engine
-      unfreeRedistributable  # Game assets, freeware
-    ];
-    maintainers = [ ];
-    homepage = "https://github.com/nxengine/nxengine-evo";
-    platforms = lib.platforms.linux;
-  };
-}