philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

mgba: Qt 5 infrastructure update

Browse source
This commit is contained in:
Thomas Tuegel 2015-12-19 20:12:57 -06:00
parent 700546fd12
commit 0b303f6edd
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/misc/emulators/mgba/default.nix
View file

@ -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;

2
pkgs/top-level/all-packages.nix
View file

@ -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 { };