public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mame: make the parallel build reliable

Browse Source
This commit is contained in:
Jamie McClymont 2020-09-23 14:45:15 +12:00 committed by Jon
parent c7fdc43709
commit 561078189e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/misc/emulators/mame/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper { stdenv, mkDerivation, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper
, python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama
, libpcap, CoreAudioKit, ForceFeedback , libpcap, CoreAudioKit, ForceFeedback
, installShellFiles }: , installShellFiles }:
@ -51,7 +51,15 @@ in mkDerivation {
# by default MAME assumes that paths with stock resources # by default MAME assumes that paths with stock resources
# are relative and that you run MAME changing to # are relative and that you run MAME changing to
# install directory, so we add absolute paths here # 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 = '' postPatch = ''
substituteInPlace src/emu/emuopts.cpp \ substituteInPlace src/emu/emuopts.cpp \