Commit 9b85f8d6 authored by ajs124's avatar ajs124
Browse files

instead-launcher: remove

parent f5753523
Loading
Loading
Loading
Loading
+0 −32
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }:

stdenv.mkDerivation rec {
  pname = "instead-launcher";

  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "instead-hub";
    repo = "instead-launcher";
    rev = version;
    sha256 = "1svy8i8anspway01pnz2cy69aad03anvkq04wrdfv1h9c34gbvb9";
  };

  patches = [ ./path.patch ];

  postPatch = ''
    substituteInPlace platform.cpp --subst-var-by instead ${instead}
  '';

  nativeBuildInputs = [ qmake4Hook ];

  buildInputs = [ zlib ];

  meta = with lib; {
    homepage = "https://instead.syscall.ru/wiki/en/instead-launcher";
    description = "Install and play games from INSTEAD repository";
    license = licenses.gpl2;
    platforms = platforms.linux;
    maintainers = with maintainers; [ orivej ];
  };
}
+0 −39
Original line number Diff line number Diff line
From c7460a7fc255ef4e8e0e37798605c4d8bb50633d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 1 Apr 2017 01:30:37 +0000
Subject: [PATCH] path

---
 mainwindow.cpp | 2 +-
 platform.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9687c4e..234b176 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -688,7 +688,7 @@ void MainWindow::loadConfig() {
     if ( args.contains( "default-gamespath" ) )
 	defGamesPath = args["default-gamespath"].toString();
 
-    QString insteadPath = conf.value("InsteadPath", defInsteadPath).toString();
+    QString insteadPath = defInsteadPath;
     bool autoRefresh = conf.value("AutoRefresh", "false").toString() == "true";
     bool autoRefreshSW = conf.value("AutoRefreshSW", "false").toString() == "true";
     QString lang = conf.value( "Language", "*" ).toString();
diff --git a/platform.cpp b/platform.cpp
index bda86be..c356f1c 100644
--- a/platform.cpp
+++ b/platform.cpp
@@ -22,7 +22,7 @@ QString getConfigPath() {
 }
 
 QString getDefaultInterpreterPath() {
-    return "/usr/local/bin/sdl-instead";
+    return "@instead@/bin/sdl-instead";
 }
 
 #elif defined(Q_OS_WIN)
-- 
2.12.2
+1 −0
Original line number Diff line number Diff line
@@ -765,6 +765,7 @@ mapAliases ({
  imagemagick7_light = imagemagick_light; # Added 2021-02-22
  imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04
  impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27
  instead-launcher = throw "instead-launcher has been removed, because it depended on qt4"; # Added 2023-07-26
  insync-v3 = throw "insync-v3 has been merged into the insync package; use insync instead"; #Added 2023-05-13
  i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21
  inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped";
+0 −2
Original line number Diff line number Diff line
@@ -38001,8 +38001,6 @@ with pkgs;
  instead = callPackage ../games/instead { };
  instead-launcher = callPackage ../games/instead-launcher { };
  iortcw = callPackage ../games/iortcw { };
  # used as base package for iortcw forks
  iortcw_sp = callPackage ../games/iortcw/sp.nix { };