From 580b8f8ca8fb7c58639603b0cfb266de83aec767 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 15 Jun 2018 20:31:53 -0500 Subject: [PATCH] citra: 2018-02-23 -> 2018-06-09 --- pkgs/misc/emulators/citra/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index 453114e3b7a..1845757fb30 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }: +{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost, curl, gtest }: stdenv.mkDerivation rec { - name = "citra-2018-02-23"; + name = "citra-${version}"; + version = "2018-06-09"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "e51a642a13b9c2eda43d875fe318f627e11d480f"; - sha256 = "0cw9cqbljc87rjyr2alfryp04mxpvd5mdlyrmnp9yis3xr8g9sa1"; + rev = "cf9bfe0690f1934847500cc5079b1aaf3299a507"; + sha256 = "1ryc5d3fnhzlrzh1yljbq9x5n79dsb5hgqdba8z4x56iccx0kd0p"; }; + enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 qtbase boost curl gtest ]; + buildInputs = [ SDL2 qtbase qtmultimedia boost curl gtest ]; cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ]; preConfigure = '' @@ -21,13 +23,11 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { - homepage = https://citra-emu.org/; - description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games."; - platforms = [ "x86_64-linux" "i686-linux" ]; + homepage = "https://citra-emu.org"; + description = "An open-source emulator for the Nintendo 3DS"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; }; }