diff options
author | Okina Matara <okinan@chiru.no> | 2018-06-15 20:31:53 -0500 |
---|---|---|
committer | Okina Matara <okinan@chiru.no> | 2018-06-15 20:31:53 -0500 |
commit | 580b8f8ca8fb7c58639603b0cfb266de83aec767 (patch) | |
tree | 972f6dba929f8b9b0a2cd67bd1cc4d37c897686b /pkgs/misc/emulators | |
parent | eeb621194426d30f4754d007e05e3e41dc2bc59d (diff) | |
download | nixlib-580b8f8ca8fb7c58639603b0cfb266de83aec767.tar nixlib-580b8f8ca8fb7c58639603b0cfb266de83aec767.tar.gz nixlib-580b8f8ca8fb7c58639603b0cfb266de83aec767.tar.bz2 nixlib-580b8f8ca8fb7c58639603b0cfb266de83aec767.tar.lz nixlib-580b8f8ca8fb7c58639603b0cfb266de83aec767.tar.xz nixlib-580b8f8ca8fb7c58639603b0cfb266de83aec767.tar.zst nixlib-580b8f8ca8fb7c58639603b0cfb266de83aec767.zip |
citra: 2018-02-23 -> 2018-06-09
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/citra/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index 453114e3b7a0..1845757fb308 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; }; } |