diff options
| author | Jamie McClymont <jamie@kwiius.com> | 2020-09-23 14:45:15 +1200 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-09-22 23:11:29 -0700 |
| commit | 561078189e9ef80ece94f1d92c47d162eeb699e2 (patch) | |
| tree | 5a4f8fc7123071f44e6f48c9add283f0d13da942 /pkgs/misc/emulators/mame | |
| parent | c7fdc43709c1e31b6b46cba52ba008cdb4359a2e (diff) | |
| download | nixpkgs-561078189e9ef80ece94f1d92c47d162eeb699e2.tar nixpkgs-561078189e9ef80ece94f1d92c47d162eeb699e2.tar.gz nixpkgs-561078189e9ef80ece94f1d92c47d162eeb699e2.tar.bz2 nixpkgs-561078189e9ef80ece94f1d92c47d162eeb699e2.tar.lz nixpkgs-561078189e9ef80ece94f1d92c47d162eeb699e2.tar.xz nixpkgs-561078189e9ef80ece94f1d92c47d162eeb699e2.tar.zst nixpkgs-561078189e9ef80ece94f1d92c47d162eeb699e2.zip | |
mame: make the parallel build reliable
Diffstat (limited to 'pkgs/misc/emulators/mame')
| -rw-r--r-- | pkgs/misc/emulators/mame/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index a9901fa3dcc..f83e26c28ce 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: @@ -51,7 +51,15 @@ in mkDerivation { # by default MAME assumes that paths with stock resources # are relative and that you run MAME changing to # install directory, so we add absolute paths here - patches = [ ./emuopts.patch ]; + patches = [ + ./emuopts.patch + # Make the parallel build reliable -- see https://github.com/mamedev/mame/pull/7279 + (fetchpatch { + name = "fix-mame-parallel-build.patch"; + url = "https://github.com/mamedev/mame/commit/13a54fd4e8b8b1a4aad77671562b2d9ef3d82e1f.patch"; + sha256 = "1p4bszir9hcdjx6am58p48zh17rhjzlhx2baiacas7fnig61i02n"; + }) + ]; postPatch = '' substituteInPlace src/emu/emuopts.cpp \ |