|
15 | 15 | pkg-config, |
16 | 16 | qt6Packages, |
17 | 17 | SDL2, |
| 18 | + SDL2_net, |
18 | 19 | speexdsp, |
19 | 20 | vulkan-headers, |
20 | 21 | vulkan-loader, |
|
26 | 27 | withAngrylionRdpPlus ? false, |
27 | 28 | }: |
28 | 29 |
|
29 | | -let |
30 | | - inherit (qt6Packages) |
31 | | - qtbase |
32 | | - qtsvg |
33 | | - qtwayland |
34 | | - wrapQtAppsHook |
35 | | - ; |
36 | | -in |
37 | | -stdenv.mkDerivation rec { |
| 30 | +stdenv.mkDerivation (finalAttrs: { |
38 | 31 | pname = "rmg"; |
39 | | - version = "0.6.7"; |
| 32 | + version = "0.7.5"; |
40 | 33 |
|
41 | 34 | src = fetchFromGitHub { |
42 | 35 | owner = "Rosalie241"; |
43 | 36 | repo = "RMG"; |
44 | | - rev = "v${version}"; |
45 | | - hash = "sha256-4tL8x3Mb48VhzQpubSiETbkyas2+a0RL1SDNsEO7iJk="; |
| 37 | + tag = "v${finalAttrs.version}"; |
| 38 | + hash = "sha256-sjjGFV2Pse1sNWYpmu5+Y0ePB738S7jPOzFCmmeCPXA="; |
46 | 39 | }; |
47 | 40 |
|
48 | 41 | nativeBuildInputs = [ |
49 | 42 | cmake |
50 | 43 | nasm |
51 | 44 | pkg-config |
52 | | - wrapQtAppsHook |
| 45 | + qt6Packages.wrapQtAppsHook |
53 | 46 | which |
54 | 47 | ]; |
55 | 48 |
|
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 | + ); |
73 | 75 |
|
74 | 76 | cmakeFlags = [ |
75 | | - "-DPORTABLE_INSTALL=OFF" |
| 77 | + (lib.cmakeBool "PORTABLE_INSTALL" false) |
76 | 78 | # mupen64plus-input-gca is written in Rust, so we can't build it with |
77 | 79 | # everything else. |
78 | | - "-DNO_RUST=ON" |
79 | | - "-DUSE_ANGRYLION=${lib.boolToString withAngrylionRdpPlus}" |
| 80 | + (lib.cmakeBool "NO_RUST" true) |
| 81 | + (lib.cmakeBool "USE_ANGRYLION" withAngrylionRdpPlus) |
80 | 82 | ]; |
81 | 83 |
|
82 | 84 | qtWrapperArgs = |
83 | 85 | lib.optionals stdenv.hostPlatform.isLinux [ |
84 | 86 | "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" |
85 | 87 | ] |
86 | | - ++ lib.optional withWayland "--set RMG_WAYLAND 1"; |
| 88 | + ++ lib.optional withWayland "--set RMG_ALLOW_WAYLAND 1"; |
87 | 89 |
|
88 | 90 | passthru.updateScript = gitUpdater { rev-prefix = "v"; }; |
89 | 91 |
|
90 | | - meta = with lib; { |
| 92 | + meta = { |
91 | 93 | homepage = "https://github.com/Rosalie241/RMG"; |
| 94 | + changelog = "https://github.com/Rosalie241/RMG/releases/tag/v${finalAttrs.version}"; |
92 | 95 | description = "Rosalie's Mupen GUI"; |
93 | 96 | longDescription = '' |
94 | 97 | Rosalie's Mupen GUI is a free and open-source mupen64plus front-end |
95 | 98 | written in C++. It offers a simple-to-use user interface. |
96 | 99 | ''; |
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; |
99 | 102 | mainProgram = "RMG"; |
100 | | - maintainers = with maintainers; [ slam-bert ]; |
| 103 | + maintainers = with lib.maintainers; [ slam-bert ]; |
101 | 104 | }; |
102 | | -} |
| 105 | +}) |
0 commit comments