From 875ba8ecdb329a294f2aafc3f5062fb81a2171fe Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 13 Oct 2022 23:18:42 -0300 Subject: [PATCH] mgba: 0.9.3 -> 0.10.0 Now with lua scripting engine! --- pkgs/applications/emulators/mgba/default.nix | 24 ++++++++++++-------- pkgs/top-level/all-packages.nix | 10 +++++++- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index 4424bedc6f23..ce0ea6d6de8b 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -3,12 +3,14 @@ , fetchFromGitHub , SDL2 , cmake -, libepoxy -, ffmpeg_4 +, copyDesktopItems +, ffmpeg , imagemagick , libedit , libelf +, libepoxy , libzip +, lua , makeDesktopItem , minizip , pkg-config @@ -18,31 +20,33 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mgba"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; - rev = version; - hash = "sha256-0ZtoyyoD+YjplJlPFpZgIg5119j/6X8ZaSZP+UpX5K0="; + rev = finalAttrs.version; + hash = "sha256-2thc2v3aD8t1PrREZIjzRuYfP7b3BA7uFb6R95zxsZI="; }; nativeBuildInputs = [ cmake + copyDesktopItems pkg-config wrapQtAppsHook ]; buildInputs = [ SDL2 - libepoxy - ffmpeg_4 + ffmpeg imagemagick libedit libelf + libepoxy libzip + lua minizip qtbase qtmultimedia @@ -79,9 +83,9 @@ stdenv.mkDerivation rec { runners, and a modern feature set for emulators that older emulators may not support. ''; + changelog = "https://github.com/mgba-emu/mgba/blob/${finalAttrs.version}/CHANGES"; license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; platforms = platforms.linux; }; -} -# TODO: use desktopItem functions +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bf589bfa543..6ea2c04db5fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1580,7 +1580,15 @@ with pkgs; melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; - mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; + mgba = callPackage ../applications/emulators/mgba { + ffmpeg = ffmpeg_4; + lua = lua5_4; + inherit (libsForQt5) + qtbase + qtmultimedia + qttools + wrapQtAppsHook; + }; mupen64plus = callPackage ../applications/emulators/mupen64plus { };