From bdf7cf5939b24f3aa04f21a14c5e36d19b96bb8d Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 8 Oct 2020 05:50:06 +0300 Subject: [PATCH] mame: 0.224 -> 0.225 (#99969) --- pkgs/misc/emulators/mame/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index f83e26c28ce..3033ce8dc7b 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "224"; + minorVersion = "225"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1z012fk7nlvxxixxcavmzc9443xli6i7xzz7fdf755g7v1cys7im"; + sha256 = "0ln5z8xp81j2af2s94dixnk9n68qpi6b3plynp3pharg6dd55yac"; }; hardeningDisable = [ "fortify" ]; @@ -53,12 +53,6 @@ in mkDerivation { # install directory, so we add absolute paths here 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 = ''