Merge pull request #235479 from thiagokokada/bump-mame

mame: 0.252 -> 0.255
This commit is contained in:
Pol Dellaiera
2023-06-03 06:47:06 +02:00
committed by GitHub
+4 -9
View File
@@ -15,7 +15,6 @@
, libjpeg
, libpcap
, libpulseaudio
, lua5_3
, makeDesktopItem
, makeWrapper
, papirus-icon-theme
@@ -39,14 +38,14 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
version = "0.252";
version = "0.255";
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${srcVersion}";
hash = "sha256-snef00pTbukiLQp8eAMfuIqNV3l0wP1+KlpFnS3iKFg=";
hash = "sha256-pdPKxEHxynBIB2lUG6yjKNcY8MlOlk4pfr7WwqaA9Dk=";
};
outputs = [ "out" "tools" ];
@@ -61,7 +60,8 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_LIB_FLAC=1"
"USE_SYSTEM_LIB_GLM=1"
"USE_SYSTEM_LIB_JPEG=1"
"USE_SYSTEM_LIB_LUA=1"
# https://www.mamedev.org/?p=523
# "USE_SYSTEM_LIB_LUA=1"
"USE_SYSTEM_LIB_PORTAUDIO=1"
"USE_SYSTEM_LIB_PORTMIDI=1"
"USE_SYSTEM_LIB_PUGIXML=1"
@@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
expat
zlib
flac
lua5_3
portmidi
portaudio
utf8proc
@@ -117,10 +116,6 @@ stdenv.mkDerivation rec {
--subst-var-by mamePath "$out/opt/mame"
'';
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=use-after-free"
];
desktopItems = [
(makeDesktopItem {
name = "MAME";