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

Merge pull request #82633 from kolbycrouch/master

Browse Source 
retroarch: 1.8.1 -> 1.8.5
This commit is contained in:
Matthew Bauer 2020-03-21 23:49:01 -04:00 committed by GitHub
commit 81d84153c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 518 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -3948,6 +3948,11 @@
githubId = 13721712;
name = "Konrad Langenberg";
};
kolbycrouch = {
email = "kjc.devel@gmail.com";
github = "kolbycrouch";
name = "Kolby Crouch";
};
konimex = {
email = "herdiansyah@netc.eu";
github = "konimex";

837
pkgs/misc/emulators/retroarch/cores.nix
View File

File diff suppressed because it is too large Load Diff

41
pkgs/misc/emulators/retroarch/default.nix
View File

@ -19,22 +19,14 @@
with stdenv.lib;
let
# ibtool is closed source so we have to download the blob
osx-MainMenu = fetchurl {
url = "https://github.com/matthewbauer/RetroArch/raw/b146a9ac6b2b516652a7bf05a9db5a804eab323d/pkg/apple/OSX/en.lproj/MainMenu.nib";
sha256 = "13k1l628wy0rp6wxrpwr4g1m9c997d0q8ks50f8zhmh40l5j2sp8";
};
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "retroarch-bare";
version = "1.8.1";
version = "1.8.5";
src = fetchFromGitHub {
owner = "libretro";
repo = "RetroArch";
sha256 = "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7";
sha256 = "1pg8j9wvwgrzsv4xdai6i6jgdcc922v0m42rbqxvbghbksrc8la3";
rev = "v${version}";
};
@ -50,33 +42,10 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = if stdenv.isLinux then [ "--enable-kms" ] else "";
configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ];
postInstall = optionalString withVulkan ''
wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
'' + optionalString stdenv.targetPlatform.isDarwin ''
EXECUTABLE_NAME=RetroArch
PRODUCT_NAME=RetroArch
MACOSX_DEPLOYMENT_TARGET=10.5
app=$out/Applications/$PRODUCT_NAME.app
install -D pkg/apple/OSX/Info.plist $app/Contents/Info.plist
echo "APPL????" > $app/Contents/PkgInfo
mkdir -p $app/Contents/MacOS
ln -s $out/bin/retroarch $app/Contents/MacOS/$EXECUTABLE_NAME
# Hack to fill in Info.plist template w/o using xcode
sed -i -e 's,''${EXECUTABLE_NAME}'",$EXECUTABLE_NAME," \
-e 's,''${MACOSX_DEPLOYMENT_TARGET}'",$MACOSX_DEPLOYMENT_TARGET," \
-e 's,''${PRODUCT_NAME}'",$PRODUCT_NAME," \
-e 's,''${PRODUCT_NAME:rfc1034identifier}'",$PRODUCT_NAME," \
$app/Contents/Info.plist
install -D ${osx-MainMenu} \
$app/Contents/Resources/en.lproj/MainMenu.nib
install -D pkg/apple/OSX/en.lproj/InfoPlist.strings \
$app/Contents/Resources/en.lproj/InfoPlist.strings
install -D media/retroarch.icns $app/Contents/Resources/retroarch.icns
'';
preFixup = "rm $out/bin/retroarch-cg2glsl";
@ -86,6 +55,6 @@ in stdenv.mkDerivation rec {
description = "Multi-platform emulator frontend for libretro cores";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ MP2E edwtjo matthewbauer ];
maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch ];
};
}

29
pkgs/top-level/all-packages.nix
View File

@ -22459,7 +22459,6 @@ in
inherit (lib) optional;
in with libretro;
([ ]
++ optional (cfg.enable4do or false) _4do
++ optional (cfg.enableAtari800 or false) atari800
++ optional (cfg.enableBeetleGBA or false) beetle-gba
++ optional (cfg.enableBeetleLynx or false) beetle-lynx
@ -22467,26 +22466,33 @@ in
++ optional (cfg.enableBeetlePCEFast or false) beetle-pce-fast
++ optional (cfg.enableBeetlePCFX or false) beetle-pcfx
++ optional (cfg.enableBeetlePSX or false) beetle-psx
++ optional (cfg.enableBeetlePSXHW or false) beetle-psx-hw
++ optional (cfg.enableBeetleSaturn or false) beetle-saturn
++ optional (cfg.enableBeetleSaturnHW or false) beetle-saturn-hw
++ optional (cfg.enableBeetleSNES or false) beetle-snes
++ optional (cfg.enableBeetleSuperGrafx or false) beetle-supergrafx
++ optional (cfg.enableBeetleWswan or false) beetle-wswan
++ optional (cfg.enableBeetleVB or false) beetle-vb
++ optional (cfg.enableBlueMSX or false) bluemsx
++ optional (cfg.enableBsnesMercury or false) bsnes-mercury
++ optional (cfg.enableDOSBox or false) dosbox
++ optional (cfg.enableCitra or false) citra
++ optional (cfg.enableDesmume or false) desmume
++ optional (cfg.enableDesmume2015 or false) desmume2015
++ optional (cfg.enableDolphin or false) dolphin
++ optional (cfg.enableFBA or false) fba
++ optional (cfg.enableDOSBox or false) dosbox
++ optional (cfg.enableEightyOne or false) eightyone
++ optional (cfg.enableFBAlpha2012 or false) fbalpha2012
++ optional (cfg.enableFBNeo or false) fbneo
++ optional (cfg.enableFceumm or false) fceumm
++ optional (cfg.enableFlycast or false) flycast
++ optional (cfg.enableFMSX or false) fmsx
++ optional (cfg.enableFreeIntv or false) freeintv
++ optional (cfg.enableGambatte or false) gambatte
++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx
++ optional (cfg.enableGpsp or false) gpsp
++ optional (cfg.enableGW or false) gw
++ optional (cfg.enableHandy or false) handy
++ optional (cfg.enableHatari or false) hatari
++ optional (cfg.enableHiganSFC or false) higan-sfc
++ optional (cfg.enableMAME or false) mame
++ optional (cfg.enableMAME2000 or false) mame2000
++ optional (cfg.enableMAME2003 or false) mame2003
@ -22495,10 +22501,13 @@ in
++ optional (cfg.enableMAME2015 or false) mame2015
++ optional (cfg.enableMAME2016 or false) mame2016
++ optional (cfg.enableMesen or false) mesen
++ optional (cfg.enableMeteor or false) meteor
++ optional (cfg.enableMGBA or false) mgba
++ optional (cfg.enableMupen64Plus or false) mupen64plus
++ optional (cfg.enableNeoCD or false) neocd
++ optional (cfg.enableNestopia or false) nestopia
++ optional (cfg.enableO2EM or false) o2em
++ optional (cfg.enableOpera or false) opera
++ optional (cfg.enableParallelN64 or false) parallel-n64
++ optional (cfg.enablePCSXRearmed or false) pcsx_rearmed
++ optional (cfg.enablePicodrive or false) picodrive
@ -22507,24 +22516,22 @@ in
++ optional (cfg.enablePrboom or false) prboom
++ optional (cfg.enableProSystem or false) prosystem
++ optional (cfg.enableQuickNES or false) quicknes
++ optional (cfg.enableSameBoy or false) sameboy
++ optional (cfg.enableScummVM or false) scummvm
++ optional (cfg.enableSMSPlusGX or false) smsplus-gx
++ optional (cfg.enableSnes9x or false) snes9x
++ optional (cfg.enableSnes9x2002 or false) snes9x2002
++ optional (cfg.enableSnes9x2005 or false) snes9x2005
++ optional (cfg.enableSnes9x2010 or false) snes9x2010
++ optional (cfg.enableStella or false) stella
++ optional (cfg.enableStella2014 or false) stella2014
++ optional (cfg.enableTGBDual or false) tgbdual
++ optional (cfg.enableTIC80 or false) tic80
++ optional (cfg.enableVbaNext or false) vba-next
++ optional (cfg.enableVbaM or false) vba-m
++ optional (cfg.enableVecx or false) vecx
++ optional (cfg.enableVirtualJaguar or false) virtualjaguar
++ optional (cfg.enableYabause or false) yabause
# added on 2017-02-25 due #23163
++ optional (cfg.enableMednafenPCEFast or false)
(throw "nix config option enableMednafenPCEFast has been renamed to enableBeetlePCEFast")
++ optional (cfg.enableMednafenPSX or false)
(throw "nix config option enableMednafenPSX has been renamed to enableBeetlePSX")
++ optional (cfg.enableMednafenSaturn or false)
(throw "nix config option enableMednafenSaturn has been renamed to enableBeetleSaturn")
);
wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix {