diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
| commit | 3afa2460386b1472128e302d1db13dba54e68e12 (patch) | |
| tree | 1bc0a79319449f29cbd5a1715c0135db1bed9337 /pkgs/misc | |
| parent | d9036a02b5c5ef31e18e913ce7e2eb56999d311e (diff) | |
| parent | f4792cdc0cffc0d1843f5d8bb3e458546646f67c (diff) | |
| download | nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.gz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.bz2 nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.lz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.xz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.zst nixlib-3afa2460386b1472128e302d1db13dba54e68e12.zip | |
Merge branch 'staging'
This includes a security update of expat.
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/higan/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/emulators/pcsx2/default.nix | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index b5707213530a..f180a446d055 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { }; patches = [ ./0001-change-flags.diff ]; + postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp"; buildInputs = [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ]; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 1b95bca643c7..673e4c3ed087 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0s7mxq2cgzwjfsq0vhpz6ljk7wr725nxg48128iyirf85585l691"; }; + postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp"; + configurePhase = '' mkdir -p build cd build @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { soundtouch wxGTK30 zlib ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Playstation 2 emulator"; longDescription= '' |