diff --git a/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff b/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff index 44850e9fbcea..d619219f50fe 100644 --- a/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff +++ b/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff @@ -1,8 +1,8 @@ diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py -index 641db77..712c55b 100644 +index aeca3e3..aeb6763 100644 --- a/minigalaxy/launcher.py +++ b/minigalaxy/launcher.py -@@ -77,6 +77,7 @@ def get_execute_command(game) -> list: +@@ -84,6 +84,7 @@ def get_execute_command(game) -> list: if game.get_info("use_mangohud") is True: exe_cmd.insert(0, "mangohud") exe_cmd.insert(1, "--dlsym") @@ -11,22 +11,22 @@ index 641db77..712c55b 100644 logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd)) return exe_cmd diff --git a/tests/test_installer.py b/tests/test_installer.py -index 8e6cb76..a9d9f46 100644 +index d459b62..dee93cb 100644 --- a/tests/test_installer.py +++ b/tests/test_installer.py -@@ -296,13 +296,13 @@ def test_get_exec_line(self, mock_list_dir, mock_which): +@@ -405,13 +405,13 @@ class Test(TestCase): mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"] result1 = installer.get_exec_line(game1) -- self.assertEqual(result1, "scummvm -c beneath.ini") -+ self.assertEqual(result1, "@steamrun@ scummvm -c beneath.ini") +- self.assertEqual("scummvm -c beneath.ini", result1) ++ self.assertEqual("@steamrun@ scummvm -c beneath.ini", result1) game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux") mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"] result2 = installer.get_exec_line(game2) -- self.assertEqual(result2, "./start.sh") -+ self.assertEqual(result2, "@steamrun@ ./start.sh") +- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2) ++ self.assertEqual('@steamrun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2) @mock.patch('os.path.getsize') @mock.patch('os.listdir') diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix index 9d3772d91b44..51791c74717d 100644 --- a/pkgs/by-name/mi/minigalaxy/package.nix +++ b/pkgs/by-name/mi/minigalaxy/package.nix @@ -6,24 +6,26 @@ gobject-introspection, gtk3, libnotify, + nix-update-script, python3Packages, steam-run, replaceVars, unzip, webkitgtk_4_1, wrapGAppsHook3, + xdg-utils, }: python3Packages.buildPythonApplication rec { pname = "minigalaxy"; - version = "1.3.1"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "sharkwouter"; repo = "minigalaxy"; tag = version; - hash = "sha256-nxWJm+CkxZqRMUYQA0ZJKOb2fD1tPYXnYhy+DOnDbkQ="; + hash = "sha256-ZHTjppdLxKDURceonbH7dJz+krBhu3lr2P7QPVDxRZw="; }; patches = [ @@ -32,12 +34,6 @@ python3Packages.buildPythonApplication rec { }) ]; - postPatch = '' - substituteInPlace minigalaxy/installer.py \ - --replace-fail '"unzip"' "\"${lib.getExe unzip}\"" \ - --replace-fail "'unzip'" "\"${lib.getExe unzip}\"" - ''; - nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection @@ -47,6 +43,16 @@ python3Packages.buildPythonApplication rec { glib-networking gtk3 libnotify + webkitgtk_4_1 + ]; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + pygobject3 + requests ]; nativeCheckInputs = with python3Packages; [ @@ -59,25 +65,29 @@ python3Packages.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - pythonPath = [ - python3Packages.pygobject3 - python3Packages.requests - webkitgtk_4_1 - ]; - dontWrapGApps = true; preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --suffix PATH : "${ + lib.makeBinPath [ + unzip + xdg-utils + ] + }" + ) ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://sharkwouter.github.io/minigalaxy/"; changelog = "https://github.com/sharkwouter/minigalaxy/blob/${version}/CHANGELOG.md"; downloadPage = "https://github.com/sharkwouter/minigalaxy/releases"; description = "Simple GOG client for Linux"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ RoGreat ]; platforms = lib.platforms.linux; }; }