cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #147645 from thiagokokada/bump-mame

Browse source 
mame: 0.237 -> 0.238
This commit is contained in:
Thiago Kenji Okada 2021-11-28 10:23:40 -03:00 committed by GitHub
commit 4d5ac38148
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/misc/emulators/mame/default.nix
View file

@ -33,13 +33,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mame"; pname = "mame";
version = "0.237"; version = "0.238";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mamedev"; owner = "mamedev";
repo = "mame"; repo = "mame";
rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}"; rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
sha256 = "sha256-0GOzpE8YP32ixz+c4dtDur9K0Szf7cl/dkWzPcJRFAM="; sha256 = "sha256-kh0kvtl+zPJjBWUXyzb/LSbPoJRxh55vUwF2G06tzoo=";
}; };
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];

6
pkgs/top-level/all-packages.nix
View file

@ -32437,12 +32437,6 @@ with pkgs;
mame = libsForQt514.callPackage ../misc/emulators/mame { mame = libsForQt514.callPackage ../misc/emulators/mame {
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
# TODO: remove it on mame 0.238
stdenv =
if stdenv.cc.isClang then
overrideCC stdenv clang_6
else
stdenv;
}; };
martyr = callPackage ../development/libraries/martyr { }; martyr = callPackage ../development/libraries/martyr { };