pyrox.dev
solarus-launcher/quest-editor: un-vendor qlementine in nixpkgs (#431017)
authored by
Peder Bergebakken Sundt
and committed by
GitHub
d9f8d701
6a71e651
+44
pkgs/by-name/qt/qtappinstancemanager/package.nix
+44
pkgs/by-name/qt/qtappinstancemanager/package.nix
···
1
+
{
2
+
lib,
3
+
stdenv,
4
+
fetchFromGitHub,
5
+
cmake,
6
+
qt6,
7
+
nix-update-script,
8
+
}:
9
+
10
+
stdenv.mkDerivation (finalAttrs: {
11
+
pname = "qtappinstancemanager";
12
+
version = "1.3.0";
13
+
14
+
src = fetchFromGitHub {
15
+
owner = "oclero";
16
+
repo = "qtappinstancemanager";
17
+
tag = "v${finalAttrs.version}";
18
+
hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M=";
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
cmake
23
+
];
24
+
25
+
buildInputs = [
26
+
qt6.qtbase
27
+
];
28
+
29
+
dontWrapQtApps = true;
30
+
31
+
passthru = {
32
+
updateScript = nix-update-script { };
33
+
};
34
+
35
+
meta = {
36
+
description = "Single application instance manager for Qt6";
37
+
homepage = "https://github.com/oclero/qtappinstancemanager";
38
+
changelog = "https://github.com/oclero/qtappinstancemanager/blob/${finalAttrs.src.tag}/CHANGELOG.md";
39
+
license = lib.licenses.mit;
40
+
maintainers = with lib.maintainers; [ normalcea ];
41
+
mainProgram = "qtappinstancemanager";
42
+
platforms = lib.platforms.all;
43
+
};
44
+
})
+11
-36
pkgs/by-name/so/solarus-launcher/package.nix
+11
-36
pkgs/by-name/so/solarus-launcher/package.nix
···
2
2
lib,
3
3
stdenv,
4
4
fetchFromGitLab,
5
-
fetchFromGitHub,
6
5
replaceVars,
7
6
cmake,
8
7
ninja,
···
16
15
libvorbis,
17
16
solarus,
18
17
glm,
19
-
qt6Packages,
20
-
kdePackages,
18
+
qt6,
19
+
qlementine,
20
+
qlementine-icons,
21
+
qtappinstancemanager,
21
22
}:
22
23
23
-
let
24
-
qlementine-icons-src = fetchFromGitHub {
25
-
owner = "oclero";
26
-
repo = "qlementine-icons";
27
-
tag = "v1.8.0";
28
-
hash = "sha256-FPndzMEOQvYNYUbT2V6iDlwoYqOww38GW/T3zUID3g0=";
29
-
};
30
-
31
-
qlementine-src = fetchFromGitHub {
32
-
owner = "oclero";
33
-
repo = "qlementine";
34
-
tag = "v1.2.1";
35
-
hash = "sha256-CPQMmTXyUW+CyLjHYx+IdXY4I2mVPudOmAksjd+izPA=";
36
-
};
37
-
38
-
qtappinstancemanager-src = fetchFromGitHub {
39
-
owner = "oclero";
40
-
repo = "qtappinstancemanager";
41
-
tag = "v1.3.0";
42
-
hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M=";
43
-
};
44
-
45
-
inherit (qt6Packages)
46
-
qtbase
47
-
qttools
48
-
wrapQtAppsHook
49
-
;
50
-
in
51
24
stdenv.mkDerivation (finalAttrs: {
52
25
pname = "solarus-launcher";
53
26
version = "2.0.0";
···
61
34
62
35
patches = [
63
36
(replaceVars ./github-fetches.patch {
64
-
inherit qlementine-src qlementine-icons-src qtappinstancemanager-src;
37
+
qlementine-src = qlementine.src;
38
+
qlementine-icons-src = qlementine-icons.src;
39
+
qtappinstancemanager-src = qtappinstancemanager.src;
65
40
})
66
41
];
67
42
···
69
44
nativeBuildInputs = [
70
45
cmake
71
46
ninja
72
-
qttools
73
-
wrapQtAppsHook
47
+
qt6.qttools
48
+
qt6.wrapQtAppsHook
74
49
];
75
50
76
51
buildInputs = [
···
83
58
libmodplug
84
59
libvorbis
85
60
solarus
86
-
qtbase
87
-
kdePackages.qtsvg
61
+
qt6.qtbase
62
+
qt6.qtsvg
88
63
glm
89
64
];
90
65
+7
-22
pkgs/by-name/so/solarus-quest-editor/package.nix
+7
-22
pkgs/by-name/so/solarus-quest-editor/package.nix
···
2
2
lib,
3
3
stdenv,
4
4
fetchFromGitLab,
5
-
fetchFromGitHub,
6
5
replaceVars,
6
+
qlementine,
7
7
cmake,
8
8
ninja,
9
9
luajit,
···
16
16
libvorbis,
17
17
solarus,
18
18
glm,
19
-
qt6Packages,
20
-
kdePackages,
19
+
qt6,
21
20
}:
22
21
23
-
let
24
-
qlementine-src = fetchFromGitHub {
25
-
owner = "oclero";
26
-
repo = "qlementine";
27
-
tag = "v1.2.0";
28
-
hash = "sha256-25PKOpQl3IkBXX14gt8KKYXXJKeutQ75O7BftEqCAxk=";
29
-
};
30
-
31
-
inherit (qt6Packages)
32
-
qtbase
33
-
qttools
34
-
wrapQtAppsHook
35
-
;
36
-
in
37
22
stdenv.mkDerivation (finalAttrs: {
38
23
pname = "solarus-quest-editor";
39
24
version = "2.0.0";
···
46
31
};
47
32
48
33
patches = [
49
-
(replaceVars ./qlementine-src.patch { inherit qlementine-src; })
34
+
(replaceVars ./qlementine-src.patch { qlementine-src = qlementine.src; })
50
35
];
51
36
52
37
strictDeps = true;
53
38
nativeBuildInputs = [
54
39
cmake
55
40
ninja
56
-
qttools
57
-
wrapQtAppsHook
41
+
qt6.qttools
42
+
qt6.wrapQtAppsHook
58
43
];
59
44
60
45
buildInputs = [
···
67
52
libmodplug
68
53
libvorbis
69
54
solarus
70
-
qtbase
71
-
kdePackages.qtsvg
55
+
qt6.qtbase
56
+
qt6.qtsvg
72
57
glm
73
58
];
74
59