diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/misc/emulators/citra | |
parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators/citra')
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/citra/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/citra/default.nix b/nixpkgs/pkgs/misc/emulators/citra/default.nix index 1845757fb308..b0d422385424 100644 --- a/nixpkgs/pkgs/misc/emulators/citra/default.nix +++ b/nixpkgs/pkgs/misc/emulators/citra/default.nix @@ -2,19 +2,18 @@ stdenv.mkDerivation rec { name = "citra-${version}"; - version = "2018-06-09"; + version = "2019-05-25"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "cf9bfe0690f1934847500cc5079b1aaf3299a507"; - sha256 = "1ryc5d3fnhzlrzh1yljbq9x5n79dsb5hgqdba8z4x56iccx0kd0p"; + rev = "186ffc235f744dad315a603a98cce4597ef0f65f"; + sha256 = "0w24an80yjmkfcxjzdvsbpahx46bmd90liq5m6qva5pgnpmxx7pn"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 qtbase qtmultimedia boost curl gtest ]; - cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ]; + buildInputs = [ SDL2 qtbase qtmultimedia boost ]; preConfigure = '' # Trick configure system. |