tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
minigalaxy: 1.3.1 -> 1.4.0
RoGreat
6 months ago
2dead82c
08472544
+35
-25
2 changed files
expand all
collapse all
unified
split
pkgs
by-name
mi
minigalaxy
inject-launcher-steam-run.diff
package.nix
+8
-8
pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff
···
1
diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py
2
-
index 641db77..712c55b 100644
3
--- a/minigalaxy/launcher.py
4
+++ b/minigalaxy/launcher.py
5
-
@@ -77,6 +77,7 @@ def get_execute_command(game) -> list:
6
if game.get_info("use_mangohud") is True:
7
exe_cmd.insert(0, "mangohud")
8
exe_cmd.insert(1, "--dlsym")
···
11
logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd))
12
return exe_cmd
13
diff --git a/tests/test_installer.py b/tests/test_installer.py
14
-
index 8e6cb76..a9d9f46 100644
15
--- a/tests/test_installer.py
16
+++ b/tests/test_installer.py
17
-
@@ -296,13 +296,13 @@ def test_get_exec_line(self, mock_list_dir, mock_which):
18
mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"]
19
20
result1 = installer.get_exec_line(game1)
21
-
- self.assertEqual(result1, "scummvm -c beneath.ini")
22
-
+ self.assertEqual(result1, "@steamrun@ scummvm -c beneath.ini")
23
24
game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux")
25
mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"]
26
27
result2 = installer.get_exec_line(game2)
28
-
- self.assertEqual(result2, "./start.sh")
29
-
+ self.assertEqual(result2, "@steamrun@ ./start.sh")
30
31
@mock.patch('os.path.getsize')
32
@mock.patch('os.listdir')
···
1
diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py
2
+
index aeca3e3..aeb6763 100644
3
--- a/minigalaxy/launcher.py
4
+++ b/minigalaxy/launcher.py
5
+
@@ -84,6 +84,7 @@ def get_execute_command(game) -> list:
6
if game.get_info("use_mangohud") is True:
7
exe_cmd.insert(0, "mangohud")
8
exe_cmd.insert(1, "--dlsym")
···
11
logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd))
12
return exe_cmd
13
diff --git a/tests/test_installer.py b/tests/test_installer.py
14
+
index d459b62..dee93cb 100644
15
--- a/tests/test_installer.py
16
+++ b/tests/test_installer.py
17
+
@@ -405,13 +405,13 @@ class Test(TestCase):
18
mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"]
19
20
result1 = installer.get_exec_line(game1)
21
+
- self.assertEqual("scummvm -c beneath.ini", result1)
22
+
+ self.assertEqual("@steamrun@ scummvm -c beneath.ini", result1)
23
24
game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux")
25
mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"]
26
27
result2 = installer.get_exec_line(game2)
28
+
- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
29
+
+ self.assertEqual('@steamrun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
30
31
@mock.patch('os.path.getsize')
32
@mock.patch('os.listdir')
+27
-17
pkgs/by-name/mi/minigalaxy/package.nix
···
6
gobject-introspection,
7
gtk3,
8
libnotify,
0
9
python3Packages,
10
steam-run,
11
replaceVars,
12
unzip,
13
webkitgtk_4_1,
14
wrapGAppsHook3,
0
15
}:
16
17
python3Packages.buildPythonApplication rec {
18
pname = "minigalaxy";
19
-
version = "1.3.1";
20
-
format = "setuptools";
21
22
src = fetchFromGitHub {
23
owner = "sharkwouter";
24
repo = "minigalaxy";
25
tag = version;
26
-
hash = "sha256-nxWJm+CkxZqRMUYQA0ZJKOb2fD1tPYXnYhy+DOnDbkQ=";
27
};
28
29
patches = [
···
32
})
33
];
34
35
-
postPatch = ''
36
-
substituteInPlace minigalaxy/installer.py \
37
-
--replace-fail '"unzip"' "\"${lib.getExe unzip}\"" \
38
-
--replace-fail "'unzip'" "\"${lib.getExe unzip}\""
39
-
'';
40
-
41
nativeBuildInputs = [
42
wrapGAppsHook3
43
gobject-introspection
···
47
glib-networking
48
gtk3
49
libnotify
0
0
0
0
0
0
0
0
0
0
50
];
51
52
nativeCheckInputs = with python3Packages; [
···
59
export HOME=$(mktemp -d)
60
'';
61
62
-
pythonPath = [
63
-
python3Packages.pygobject3
64
-
python3Packages.requests
65
-
webkitgtk_4_1
66
-
];
67
-
68
dontWrapGApps = true;
69
70
preFixup = ''
71
-
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
0
0
0
0
0
0
0
0
72
'';
0
0
73
74
meta = {
75
homepage = "https://sharkwouter.github.io/minigalaxy/";
···
77
downloadPage = "https://github.com/sharkwouter/minigalaxy/releases";
78
description = "Simple GOG client for Linux";
79
license = lib.licenses.gpl3;
80
-
maintainers = with lib.maintainers; [ ];
81
platforms = lib.platforms.linux;
82
};
83
}
···
6
gobject-introspection,
7
gtk3,
8
libnotify,
9
+
nix-update-script,
10
python3Packages,
11
steam-run,
12
replaceVars,
13
unzip,
14
webkitgtk_4_1,
15
wrapGAppsHook3,
16
+
xdg-utils,
17
}:
18
19
python3Packages.buildPythonApplication rec {
20
pname = "minigalaxy";
21
+
version = "1.4.0";
22
+
pyproject = true;
23
24
src = fetchFromGitHub {
25
owner = "sharkwouter";
26
repo = "minigalaxy";
27
tag = version;
28
+
hash = "sha256-ZHTjppdLxKDURceonbH7dJz+krBhu3lr2P7QPVDxRZw=";
29
};
30
31
patches = [
···
34
})
35
];
36
0
0
0
0
0
0
37
nativeBuildInputs = [
38
wrapGAppsHook3
39
gobject-introspection
···
43
glib-networking
44
gtk3
45
libnotify
46
+
webkitgtk_4_1
47
+
];
48
+
49
+
build-system = with python3Packages; [
50
+
setuptools
51
+
];
52
+
53
+
dependencies = with python3Packages; [
54
+
pygobject3
55
+
requests
56
];
57
58
nativeCheckInputs = with python3Packages; [
···
65
export HOME=$(mktemp -d)
66
'';
67
0
0
0
0
0
0
68
dontWrapGApps = true;
69
70
preFixup = ''
71
+
makeWrapperArgs+=(
72
+
"''${gappsWrapperArgs[@]}"
73
+
--suffix PATH : "${
74
+
lib.makeBinPath [
75
+
unzip
76
+
xdg-utils
77
+
]
78
+
}"
79
+
)
80
'';
81
+
82
+
passthru.updateScript = nix-update-script { };
83
84
meta = {
85
homepage = "https://sharkwouter.github.io/minigalaxy/";
···
87
downloadPage = "https://github.com/sharkwouter/minigalaxy/releases";
88
description = "Simple GOG client for Linux";
89
license = lib.licenses.gpl3;
90
+
maintainers = with lib.maintainers; [ RoGreat ];
91
platforms = lib.platforms.linux;
92
};
93
}