b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #103461 from GovanifY/pcsx2-usb-merge

Browse source 
pcsx2: unstable-2020-10-10 -> unstable-2020-11-13
This commit is contained in:
Christoph Hrdinka 2020-11-18 09:54:41 +01:00 committed by GitHub
parent 9a38c3a11b 6c861dc0ba
commit 567c2d880b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
maintainers/maintainer-list.nix
View file

@ -3311,6 +3311,16 @@
githubId = 1621335;
name = "Andrew Trachenko";
};
govanify = {
name = "Gauvain 'GovanifY' Roussel-Tarbouriech";
email = "gauvain@govanify.com";
github = "govanify";
githubId = 6375438;
keys = [{
longkeyid = "rsa4096/0xDE62E1E2A6145556";
fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556";
}];
};
gpyh = {
email = "yacine.hmito@gmail.com";
github = "yacinehmito";

41
pkgs/misc/emulators/pcsx2/default.nix
View file

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