Skip to content

Commit bf879ca

Browse files
authored
rmg: 0.6.7 -> 0.7.5 (#380614)
2 parents f54abd5 + 5a25bc6 commit bf879ca

File tree

1 file changed

+42
-39
lines changed

1 file changed

+42
-39
lines changed

pkgs/by-name/rm/rmg/package.nix

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
pkg-config,
1616
qt6Packages,
1717
SDL2,
18+
SDL2_net,
1819
speexdsp,
1920
vulkan-headers,
2021
vulkan-loader,
@@ -26,77 +27,79 @@
2627
withAngrylionRdpPlus ? false,
2728
}:
2829

29-
let
30-
inherit (qt6Packages)
31-
qtbase
32-
qtsvg
33-
qtwayland
34-
wrapQtAppsHook
35-
;
36-
in
37-
stdenv.mkDerivation rec {
30+
stdenv.mkDerivation (finalAttrs: {
3831
pname = "rmg";
39-
version = "0.6.7";
32+
version = "0.7.5";
4033

4134
src = fetchFromGitHub {
4235
owner = "Rosalie241";
4336
repo = "RMG";
44-
rev = "v${version}";
45-
hash = "sha256-4tL8x3Mb48VhzQpubSiETbkyas2+a0RL1SDNsEO7iJk=";
37+
tag = "v${finalAttrs.version}";
38+
hash = "sha256-sjjGFV2Pse1sNWYpmu5+Y0ePB738S7jPOzFCmmeCPXA=";
4639
};
4740

4841
nativeBuildInputs = [
4942
cmake
5043
nasm
5144
pkg-config
52-
wrapQtAppsHook
45+
qt6Packages.wrapQtAppsHook
5346
which
5447
];
5548

56-
buildInputs = [
57-
boost
58-
discord-rpc
59-
freetype
60-
hidapi
61-
libpng
62-
libsamplerate
63-
minizip
64-
qtbase
65-
qtsvg
66-
SDL2
67-
speexdsp
68-
vulkan-headers
69-
vulkan-loader
70-
xdg-user-dirs
71-
zlib
72-
] ++ lib.optional withWayland qtwayland;
49+
buildInputs =
50+
[
51+
boost
52+
discord-rpc
53+
freetype
54+
hidapi
55+
libpng
56+
libsamplerate
57+
minizip
58+
SDL2
59+
SDL2_net
60+
speexdsp
61+
vulkan-headers
62+
vulkan-loader
63+
xdg-user-dirs
64+
zlib
65+
]
66+
++ (
67+
with qt6Packages;
68+
[
69+
qtbase
70+
qtsvg
71+
qtwebsockets
72+
]
73+
++ lib.optional withWayland qtwayland
74+
);
7375

7476
cmakeFlags = [
75-
"-DPORTABLE_INSTALL=OFF"
77+
(lib.cmakeBool "PORTABLE_INSTALL" false)
7678
# mupen64plus-input-gca is written in Rust, so we can't build it with
7779
# everything else.
78-
"-DNO_RUST=ON"
79-
"-DUSE_ANGRYLION=${lib.boolToString withAngrylionRdpPlus}"
80+
(lib.cmakeBool "NO_RUST" true)
81+
(lib.cmakeBool "USE_ANGRYLION" withAngrylionRdpPlus)
8082
];
8183

8284
qtWrapperArgs =
8385
lib.optionals stdenv.hostPlatform.isLinux [
8486
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
8587
]
86-
++ lib.optional withWayland "--set RMG_WAYLAND 1";
88+
++ lib.optional withWayland "--set RMG_ALLOW_WAYLAND 1";
8789

8890
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
8991

90-
meta = with lib; {
92+
meta = {
9193
homepage = "https://github.com/Rosalie241/RMG";
94+
changelog = "https://github.com/Rosalie241/RMG/releases/tag/v${finalAttrs.version}";
9295
description = "Rosalie's Mupen GUI";
9396
longDescription = ''
9497
Rosalie's Mupen GUI is a free and open-source mupen64plus front-end
9598
written in C++. It offers a simple-to-use user interface.
9699
'';
97-
license = if withAngrylionRdpPlus then licenses.unfree else licenses.gpl3Only;
98-
platforms = platforms.linux;
100+
license = if withAngrylionRdpPlus then lib.licenses.unfree else lib.licenses.gpl3Only;
101+
platforms = lib.platforms.linux;
99102
mainProgram = "RMG";
100-
maintainers = with maintainers; [ slam-bert ];
103+
maintainers = with lib.maintainers; [ slam-bert ];
101104
};
102-
}
105+
})

0 commit comments

Comments
 (0)