diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/pcsx2/default.nix | 78 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 12 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 6 |
3 files changed, 52 insertions, 44 deletions
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 1924452e2abe..6f28c5777ca1 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -1,58 +1,66 @@ -{ alsaLib, cmake, fetchFromGitHub, glib, gtk2, gettext, libaio, libpng -, makeWrapper, perl, pkgconfig, portaudio, SDL2, soundtouch, stdenv -, wxGTK30, zlib }: +{ alsaLib, cmake, fetchFromGitHub, glib, gettext, gtk2, harfbuzz, lib, libaio +, libpng, libpcap, libxml2, makeWrapper, perl, pkgconfig, portaudio +, SDL2, soundtouch, stdenv, udev, wxGTK, zlib +}: stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.4.0"; + version = "unstable-2020-01-05"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; - rev = "v${version}"; - sha256 = "0s7mxq2cgzwjfsq0vhpz6ljk7wr725nxg48128iyirf85585l691"; + rev = "9c12937351c51b921e1f28d44b019bc52e747c51"; + sha256 = "0y1f5v99a6njmf6hyvl4z5xnrm7351rkyw2fn4f09hqn92r7zmi5"; }; postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp"; - configurePhase = '' - mkdir -p build - cd build - - cmake \ - -DBIN_DIR="$out/bin" \ - -DCMAKE_BUILD_PO=TRUE \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="$out" \ - -DDISABLE_ADVANCE_SIMD=TRUE \ - -DDISABLE_PCSX2_WRAPPER=TRUE \ - -DDOC_DIR="$out/share/doc/pcsx2" \ - -DGAMEINDEX_DIR="$out/share/pcsx2" \ - -DGLSL_SHADER_DIR="$out/share/pcsx2" \ - -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' \ - -DPACKAGE_MODE=TRUE \ - -DPLUGIN_DIR="$out/lib/pcsx2" \ - -DREBUILD_SHADER=TRUE \ - -DXDG_STD=TRUE \ - .. - ''; + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DDISABLE_ADVANCE_SIMD=TRUE" + "-DDISABLE_PCSX2_WRAPPER=TRUE" + "-DDOC_DIR=${placeholder "out"}/share/doc/pcsx2" + "-DGAMEINDEX_DIR=${placeholder "out"}/share/pcsx2" + "-DGLSL_SHADER_DIR=${placeholder "out"}/share/pcsx2" + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + "-DwxWidgets_INCLUDE_DIRS=${wxGTK}/include" + "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config" + "-DPACKAGE_MODE=TRUE" + "-DPLUGIN_DIR=${placeholder "out"}/lib/pcsx2" + "-DREBUILD_SHADER=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" + ]; postFixup = '' wrapProgram $out/bin/PCSX2 \ --set __GL_THREADED_OPTIMIZATIONS 1 ''; - nativeBuildInputs = [ cmake perl pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper perl pkgconfig ]; buildInputs = [ - alsaLib glib gettext gtk2 libaio libpng makeWrapper portaudio SDL2 - soundtouch wxGTK30 zlib + alsaLib + glib + gettext + gtk2 + harfbuzz + libaio + libpcap + libpng + libxml2 + portaudio + SDL2 + soundtouch + udev + wxGTK + zlib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Playstation 2 emulator"; longDescription= '' @@ -62,7 +70,7 @@ stdenv.mkDerivation rec { states and PS2 system memory. This allows you to play PS2 games on your PC, with many additional features and benefits. ''; - homepage = https://pcsx2.net; + homepage = "https://pcsx2.net"; maintainers = with maintainers; [ hrdinka ]; # PCSX2's source code is released under LGPLv3+. It However ships diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index af71e8fdc73d..ca82935b7675 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "4.0.2"; + version = "4.0.3"; url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; - sha256 = "0x5x9pvhryzhq1m7i8gx5wwwj341zz05zymadlhfw5w45xlm0h4r"; + sha256 = "1nhgw1wm613ln9dhjm0d03zs5adcmnqr2b50p21jbmm5k2gns0i5"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.17"; - url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "1bmj4l84q29h4km5ab5zzypns3mpf7pizybcpab6jj47cr1s303l"; + version = "5.0-rc2"; + url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; + sha256 = "1dj2z7yikab0hc06hf2kafanbaa49ignghzxq5a3la5mg8ya4vd7"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0cb0w6jwqs70854g1ixfj8r53raln0spyy1l96qv72ymbhzc353h"; + sha256 = "0zzlzz2nagrkq3m2v900w5j7k0vvxbdqffvsnjxxha8k6axl4z53"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 6cde4d6695ac..fc3d295e6ee1 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -55,16 +55,16 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.155"; + version = "0.1.156"; LanguageClient-neovim-src = fetchurl { url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; - sha256 = "0v9n450iwgvm1d4qwv742bjam3p747cvyrkapkgxy7n1ar8rz50i"; + sha256 = "0bf2va6lpgw7wqpwpfidijbzphhvw48hyc2b529qv12vwgnd1shq"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "139sj1aq0kr4r4qzhgcn2hb4dyvp5wxjz7bxbm0bbh9bv2pr98jq"; + cargoSha256 = "1w8g7pxwnjqp9zi47h4lz2mcg5daldsk5z72h8cjj750wng8a82c"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. |