diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
| commit | aa9a04883e34f6a7b89846e87654577d5b218f46 (patch) | |
| tree | 5bc2d586532b76c0248a9e3280ec7e333ef6d893 /pkgs/misc | |
| parent | 21f9180d49d1d911668620f3d8897c1e1352672a (diff) | |
| download | nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.gz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.bz2 nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.lz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.xz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.zst nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.zip | |
Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
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, 0 insertions, 5 deletions
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 77392913cb1a..1395e3ac3efe 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -21,7 +21,6 @@ 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 673e4c3ed087..1b95bca643c7 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0s7mxq2cgzwjfsq0vhpz6ljk7wr725nxg48128iyirf85585l691"; }; - postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp"; - configurePhase = '' mkdir -p build cd build @@ -52,8 +50,6 @@ stdenv.mkDerivation rec { soundtouch wxGTK30 zlib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Playstation 2 emulator"; longDescription= '' |