From 0b303f6edd1e1c24fb7659d56796d871f8c727db Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:12:57 -0600 Subject: [PATCH] mgba: Qt 5 infrastructure update --- pkgs/misc/emulators/mgba/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index edf4c6a060d..ea11e3a33e2 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, cmake, ffmpeg, imagemagick, libzip, SDL2, qt5 }: +{ stdenv, fetchurl, pkgconfig, cmake, ffmpeg, imagemagick, libzip, SDL2 +, qtbase, qtmultimedia }: stdenv.mkDerivation rec { name = "mgba-${meta.version}"; @@ -9,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cmake ffmpeg imagemagick libzip SDL2 - qt5.base qt5.multimedia + qtbase qtmultimedia ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5dfe42b989a..44df868661b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2261,7 +2261,7 @@ let mfoc = callPackage ../tools/security/mfoc { }; - mgba = callPackage ../misc/emulators/mgba { }; + mgba = qt5.callPackage ../misc/emulators/mgba { }; minissdpd = callPackage ../tools/networking/minissdpd { };