From 5a25bc6270269c545f0c5dac1f5a189cf67d3e15 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 17 Feb 2025 19:33:33 +0100 Subject: [PATCH] rmg: 0.6.7 -> 0.7.5 --- pkgs/by-name/rm/rmg/package.nix | 81 +++++++++++++++++---------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index ff31b95c13b5..8162925b2ef1 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -15,6 +15,7 @@ pkg-config, qt6Packages, SDL2, + SDL2_net, speexdsp, vulkan-headers, vulkan-loader, @@ -26,77 +27,79 @@ withAngrylionRdpPlus ? false, }: -let - inherit (qt6Packages) - qtbase - qtsvg - qtwayland - wrapQtAppsHook - ; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rmg"; - version = "0.6.7"; + version = "0.7.5"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; - rev = "v${version}"; - hash = "sha256-4tL8x3Mb48VhzQpubSiETbkyas2+a0RL1SDNsEO7iJk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-sjjGFV2Pse1sNWYpmu5+Y0ePB738S7jPOzFCmmeCPXA="; }; nativeBuildInputs = [ cmake nasm pkg-config - wrapQtAppsHook + qt6Packages.wrapQtAppsHook which ]; - buildInputs = [ - boost - discord-rpc - freetype - hidapi - libpng - libsamplerate - minizip - qtbase - qtsvg - SDL2 - speexdsp - vulkan-headers - vulkan-loader - xdg-user-dirs - zlib - ] ++ lib.optional withWayland qtwayland; + buildInputs = + [ + boost + discord-rpc + freetype + hidapi + libpng + libsamplerate + minizip + SDL2 + SDL2_net + speexdsp + vulkan-headers + vulkan-loader + xdg-user-dirs + zlib + ] + ++ ( + with qt6Packages; + [ + qtbase + qtsvg + qtwebsockets + ] + ++ lib.optional withWayland qtwayland + ); cmakeFlags = [ - "-DPORTABLE_INSTALL=OFF" + (lib.cmakeBool "PORTABLE_INSTALL" false) # mupen64plus-input-gca is written in Rust, so we can't build it with # everything else. - "-DNO_RUST=ON" - "-DUSE_ANGRYLION=${lib.boolToString withAngrylionRdpPlus}" + (lib.cmakeBool "NO_RUST" true) + (lib.cmakeBool "USE_ANGRYLION" withAngrylionRdpPlus) ]; qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" ] - ++ lib.optional withWayland "--set RMG_WAYLAND 1"; + ++ lib.optional withWayland "--set RMG_ALLOW_WAYLAND 1"; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { homepage = "https://github.com/Rosalie241/RMG"; + changelog = "https://github.com/Rosalie241/RMG/releases/tag/v${finalAttrs.version}"; description = "Rosalie's Mupen GUI"; longDescription = '' Rosalie's Mupen GUI is a free and open-source mupen64plus front-end written in C++. It offers a simple-to-use user interface. ''; - license = if withAngrylionRdpPlus then licenses.unfree else licenses.gpl3Only; - platforms = platforms.linux; + license = if withAngrylionRdpPlus then lib.licenses.unfree else lib.licenses.gpl3Only; + platforms = lib.platforms.linux; mainProgram = "RMG"; - maintainers = with maintainers; [ slam-bert ]; + maintainers = with lib.maintainers; [ slam-bert ]; }; -} +})