MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #100162 from samuelgrf/pcsx2_gtk3-x86_64

Browse source 
pcsx2: multiple improvements
This commit is contained in:
Christoph Hrdinka 2020-10-23 16:48:45 +02:00 committed by GitHub
commit 972ba804fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,21 +1,19 @@
{ alsaLib, cmake, fetchFromGitHub, glib, gettext, gtk2, harfbuzz, lib, libaio { alsaLib, cmake, fetchFromGitHub, gcc-unwrapped, gettext, glib, gtk3, harfbuzz
, libpng, libpcap, libxml2, makeWrapper, perl, pkgconfig, portaudio , libaio, libpcap, libpng, libxml2, makeWrapper, perl, pkgconfig, portaudio
, SDL2, soundtouch, stdenv, udev, wxGTK, zlib , SDL2, soundtouch, stdenv, udev, wrapGAppsHook, wxGTK, zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "pcsx2"; pname = "pcsx2";
version = "1.6.0"; version = "unstable-2020-10-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PCSX2"; owner = "PCSX2";
repo = "pcsx2"; repo = "pcsx2";
rev = "v${version}"; rev = "7e2ccd64e8e6049b6059141e8767037463421c33";
sha256 = "0528kh3275285lvfsykycdhc35c1z8pmccl2s7dfi3va2cp4x8wa"; sha256 = "0c7m74ch68p4y9xlld34a9r38kb2py6wlkg4vranc6dicxvi1b3r";
}; };
postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp";
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
"-DDISABLE_ADVANCE_SIMD=TRUE" "-DDISABLE_ADVANCE_SIMD=TRUE"
@ -23,31 +21,36 @@ stdenv.mkDerivation rec {
"-DDOC_DIR=${placeholder "out"}/share/doc/pcsx2" "-DDOC_DIR=${placeholder "out"}/share/doc/pcsx2"
"-DGAMEINDEX_DIR=${placeholder "out"}/share/pcsx2" "-DGAMEINDEX_DIR=${placeholder "out"}/share/pcsx2"
"-DGLSL_SHADER_DIR=${placeholder "out"}/share/pcsx2" "-DGLSL_SHADER_DIR=${placeholder "out"}/share/pcsx2"
"-DwxWidgets_LIBRARIES=${wxGTK}/lib" "-DGTK3_API=TRUE"
"-DwxWidgets_INCLUDE_DIRS=${wxGTK}/include"
"-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config"
"-DPACKAGE_MODE=TRUE" "-DPACKAGE_MODE=TRUE"
"-DPLUGIN_DIR=${placeholder "out"}/lib/pcsx2" "-DPLUGIN_DIR=${placeholder "out"}/lib/pcsx2"
"-DREBUILD_SHADER=TRUE" "-DREBUILD_SHADER=TRUE"
"-DUSE_LTO=TRUE"
"-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config"
"-DwxWidgets_INCLUDE_DIRS=${wxGTK}/include"
"-DwxWidgets_LIBRARIES=${wxGTK}/lib"
"-DXDG_STD=TRUE" "-DXDG_STD=TRUE"
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
"-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
"-DGTK3_API=FALSE"
]; ];
postPatch = ''
substituteInPlace cmake/BuildParameters.cmake \
--replace /usr/bin/gcc-ar ${gcc-unwrapped}/bin/gcc-ar \
--replace /usr/bin/gcc-nm ${gcc-unwrapped}/bin/gcc-nm \
--replace /usr/bin/gcc-ranlib ${gcc-unwrapped}/bin/gcc-ranlib
'';
postFixup = '' postFixup = ''
wrapProgram $out/bin/PCSX2 \ wrapProgram $out/bin/PCSX2 \
--set __GL_THREADED_OPTIMIZATIONS 1 --set __GL_THREADED_OPTIMIZATIONS 1
''; '';
nativeBuildInputs = [ cmake makeWrapper perl pkgconfig ]; nativeBuildInputs = [ cmake makeWrapper perl pkgconfig wrapGAppsHook ];
buildInputs = [ buildInputs = [
alsaLib alsaLib
glib
gettext gettext
gtk2 glib
gtk3
harfbuzz harfbuzz
libaio libaio
libpcap libpcap
@ -71,13 +74,13 @@ stdenv.mkDerivation rec {
PC, with many additional features and benefits. PC, with many additional features and benefits.
''; '';
homepage = "https://pcsx2.net"; homepage = "https://pcsx2.net";
maintainers = with maintainers; [ hrdinka ]; maintainers = with maintainers; [ hrdinka samuelgrf ];
# PCSX2's source code is released under LGPLv3+. It However ships # PCSX2's source code is released under LGPLv3+. It However ships
# additional data files and code that are licensed differently. # additional data files and code that are licensed differently.
# This might be solved in future, for now we should stick with # This might be solved in future, for now we should stick with
# license.free # license.free
license = licenses.free; license = licenses.free;
platforms = platforms.i686; platforms = platforms.x86;
}; };
} }

4
pkgs/top-level/all-packages.nix
View file

@ -22712,8 +22712,8 @@ in
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
}; };
pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { pcsx2 = callPackage ../misc/emulators/pcsx2 {
wxGTK = pkgsi686Linux.wxGTK30; wxGTK = wxGTK30-gtk3;
}; };
pekwm = callPackage ../applications/window-managers/pekwm { }; pekwm = callPackage ../applications/window-managers/pekwm { };