Merge pull request #208264 from atorres1985-contrib/mgba-refactor

mgba: remove `inherit (libsForQt5)` reference on all-packages.nix
2022-12-29 16:40:26 -03:00
parent 9f19d43274 cd8d465edd
commit f02497ed03
2 changed files with 12 additions and 13 deletions
@@ -3,21 +3,27 @@
 , fetchFromGitHub
 , SDL2
 , cmake
-, ffmpeg
+, ffmpeg_4
 , imagemagick
 , libedit
 , libelf
 , libepoxy
 , libzip
-, lua
+, lua5_4
 , minizip
 , pkg-config
-, qtbase
-, qtmultimedia
-, qttools
-, wrapQtAppsHook
+, libsForQt5
 }:

+let
+    ffmpeg = ffmpeg_4;
+    lua = lua5_4;
+    inherit (libsForQt5)
+      qtbase
+      qtmultimedia
+      qttools
+      wrapQtAppsHook;
+in
 stdenv.mkDerivation (finalAttrs: {
  pname = "mgba";
  version = "0.10.0";
@@ -2068,13 +2068,6 @@ with pkgs;
  melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { };

  mgba = callPackage ../applications/emulators/mgba {
-    ffmpeg = ffmpeg_4;
-    lua = lua5_4;
-    inherit (libsForQt5)
-      qtbase
-      qtmultimedia
-      qttools
-      wrapQtAppsHook;
  };

  mupen64plus = callPackage ../applications/emulators/mupen64plus { };