diff options
| author | Christoph Hrdinka <c.github@hrdinka.at> | 2020-11-18 09:54:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 09:54:41 +0100 |
| commit | 567c2d880b5888077a2c7a9ac356e099117d1dbb (patch) | |
| tree | ae55b8b535d33eb95feb16c397ff7529d42b029b /pkgs/misc/emulators | |
| parent | 9a38c3a11b8db6c20611e536236d3b4831ef4498 (diff) | |
| parent | 6c861dc0ba081a9abb857f30f67bc02ec24613c4 (diff) | |
| download | nixpkgs-567c2d880b5888077a2c7a9ac356e099117d1dbb.tar nixpkgs-567c2d880b5888077a2c7a9ac356e099117d1dbb.tar.gz nixpkgs-567c2d880b5888077a2c7a9ac356e099117d1dbb.tar.bz2 nixpkgs-567c2d880b5888077a2c7a9ac356e099117d1dbb.tar.lz nixpkgs-567c2d880b5888077a2c7a9ac356e099117d1dbb.tar.xz nixpkgs-567c2d880b5888077a2c7a9ac356e099117d1dbb.tar.zst nixpkgs-567c2d880b5888077a2c7a9ac356e099117d1dbb.zip | |
Merge pull request #103461 from GovanifY/pcsx2-usb-merge
pcsx2: unstable-2020-10-10 -> unstable-2020-11-13
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/pcsx2/default.nix | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index a08ee4f057f..5bbf70004ab 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -1,17 +1,41 @@ -{ alsaLib, cmake, fetchFromGitHub, gcc-unwrapped, gettext, glib, gtk3, harfbuzz -, libaio, libpcap, libpng, libxml2, makeWrapper, perl, pkgconfig, portaudio -, SDL2, soundtouch, stdenv, udev, wrapGAppsHook, wxGTK, zlib +{ alsaLib +, cmake +, fetchFromGitHub +, fmt +, gcc-unwrapped +, gettext +, glib +, gtk3 +, harfbuzz +, libaio +, libpcap +, libpng +, libpulseaudio +, libsamplerate +, libxml2 +, makeWrapper +, perl +, pkgconfig +, portaudio +, SDL2 +, soundtouch +, stdenv +, udev +, wrapGAppsHook +, wxGTK +, zlib }: stdenv.mkDerivation { pname = "pcsx2"; - version = "unstable-2020-10-10"; + version = "unstable-2020-11-13"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; - rev = "7e2ccd64e8e6049b6059141e8767037463421c33"; - sha256 = "0c7m74ch68p4y9xlld34a9r38kb2py6wlkg4vranc6dicxvi1b3r"; + fetchSubmodules = true; + rev = "319287dbe552c8405720b25dfdf5fa518deeee0b"; + sha256 = "1kswc8vw9hbv2nigp8cxrgf2s0ik7p4i203cbqci8zjmnkaqpsai"; }; cmakeFlags = [ @@ -48,6 +72,7 @@ stdenv.mkDerivation { buildInputs = [ alsaLib + fmt gettext glib gtk3 @@ -55,6 +80,8 @@ stdenv.mkDerivation { libaio libpcap libpng + libpulseaudio + libsamplerate libxml2 portaudio SDL2 @@ -74,7 +101,7 @@ stdenv.mkDerivation { PC, with many additional features and benefits. ''; homepage = "https://pcsx2.net"; - maintainers = with maintainers; [ hrdinka samuelgrf ]; + maintainers = with maintainers; [ hrdinka samuelgrf govanify ]; # PCSX2's source code is released under LGPLv3+. It However ships # additional data files and code that are licensed differently. |