diff options
author | Katharina Fey <kookie@spacekookie.de> | 2020-03-24 10:15:32 +0100 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2020-03-24 10:15:32 +0100 |
commit | 96f063dd321abc80ecaa156226cfb7cf9540315a (patch) | |
tree | 7a53ef61484fc7bfff6419b1fd635c67199f27d2 /nixpkgs/pkgs/misc/emulators | |
parent | af58f08d3d524e7b008b73a8497ea710915ffaf1 (diff) | |
parent | d96bd3394b734487d1c3bfbac0e8f17465e03afe (diff) |
Merge commit 'd96bd3394b734487d1c3bfbac0e8f17465e03afe'
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators')
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/caprice32/default.nix | 36 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/fceux/default.nix | 14 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/mame/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/mednafen/default.nix | 43 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/mednafen/server.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/mednaffe/default.nix | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/mgba/default.nix | 12 |
8 files changed, 90 insertions, 37 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/caprice32/default.nix b/nixpkgs/pkgs/misc/emulators/caprice32/default.nix index a8068e9b47b..8694d4d2d5a 100644 --- a/nixpkgs/pkgs/misc/emulators/caprice32/default.nix +++ b/nixpkgs/pkgs/misc/emulators/caprice32/default.nix @@ -1,29 +1,47 @@ -{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib }: +{ stdenv, fetchFromGitHub, desktop-file-utils, libpng +, pkgconfig, SDL, freetype, zlib }: stdenv.mkDerivation rec { pname = "caprice32"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { repo = "caprice32"; rev = "v${version}"; owner = "ColinPitrat"; - sha256 = "056vrf5yq1574g93ix8hnjqqbdqza3qcjv0f8rvpsslqcbizma9y"; + sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz"; }; - postPatch = "substituteInPlace cap32.cfg --replace /usr/local $out"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ desktop-file-utils pkgconfig ]; buildInputs = [ libpng SDL freetype zlib ]; - #fix GIT_HASH avoid depend on git - makeFlags = [ "GIT_HASH=${src.rev}" "DESTDIR=$(out)" "prefix=/"]; + makeFlags = [ + "APP_PATH=${placeholder "out"}/share/caprice32" + "RELEASE=1" + "DESTDIR=${placeholder "out"}" + "prefix=/" + ]; + + postInstall = '' + mkdir -p $out/share/icons/ + mv $out/share/caprice32/resources/freedesktop/caprice32.png $out/share/icons/ + mv $out/share/caprice32/resources/freedesktop/emulators.png $out/share/icons/ + + desktop-file-install --dir $out/share/applications \ + $out/share/caprice32/resources/freedesktop/caprice32.desktop + + desktop-file-install --dir $out/share/desktop-directories \ + $out/share/caprice32/resources/freedesktop/Emulators.directory + + install -Dm644 $out/share/caprice32/resources/freedesktop/caprice32.menu -t $out/etc/xdg/menus/applications-merged/ + ''; meta = with stdenv.lib; { description = "A complete emulation of CPC464, CPC664 and CPC6128"; - homepage = https://github.com/ColinPitrat/caprice32 ; + homepage = "https://github.com/ColinPitrat/caprice32"; license = licenses.gpl2; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; - }; + }; } diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index cec88918282..e6e19e81242 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-11109"; + version = "5.0-11608"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "93d7b3d15962a3393cf2971e14c4acf54d90cecd"; - sha256 = "1kkx3agdsc0qmf3yymlzq315nypm34qvq04qpjqycpfhmpx8gdnq"; + rev = "69ee15e5ef369d51681540e6714f02554e3bd8a6"; + sha256 = "1svi9mnddhjcv64xh3y9l68k3rix7wimq8b0mqf5hp7qrda07lx8"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/misc/emulators/fceux/default.nix b/nixpkgs/pkgs/misc/emulators/fceux/default.nix index 13ebeb1d2a9..58a6a1dd442 100644 --- a/nixpkgs/pkgs/misc/emulators/fceux/default.nix +++ b/nixpkgs/pkgs/misc/emulators/fceux/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}: +{stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkgconfig}: stdenv.mkDerivation { - name = "fceux-2.2.3"; + pname = "fceux-unstable"; + version = "2020-01-29"; - src = fetchurl { - url = mirror://sourceforge/fceultra/Source%20Code/2.2.3%20src/fceux-2.2.3.src.tar.gz; - sha256 = "0gl2i3qdmcm7v9m5kpfz98w05d8m33990jiwka043ya7lflxvrjb"; + src = fetchFromGitHub { + owner = "TASVideos"; + repo = "fceux"; + rev = "fb8d46d9697cb24b0ebe79d84eedf282f69ab337"; + sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992"; }; nativeBuildInputs = [ pkgconfig scons ]; @@ -30,6 +33,7 @@ stdenv.mkDerivation { meta = { description = "A Nintendo Entertainment System (NES) Emulator"; license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.scubed2 ]; homepage = http://www.fceux.com/; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/misc/emulators/mame/default.nix b/nixpkgs/pkgs/misc/emulators/mame/default.nix index 3c205a70375..a0455b88bec 100644 --- a/nixpkgs/pkgs/misc/emulators/mame/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mame/default.nix @@ -4,7 +4,7 @@ let majorVersion = "0"; - minorVersion = "217"; + minorVersion = "218"; desktopItem = makeDesktopItem { name = "MAME"; @@ -23,7 +23,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "0yzn29fp72k2g5xgv47ss6fr3sk9wdxw9f52nwld1baxr2adc0qx"; + sha256 = "11qschyxhi45pbpf9q3k71kybqxmcfhjml8axqpi43sv4q2ack6q"; }; hardeningDisable = [ "fortify" ]; diff --git a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix index 337d19804fc..777c9f043f4 100644 --- a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: +, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib }: stdenv.mkDerivation rec { pname = "mednafen"; - version = "0.9.48"; + version = "1.22.2"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; + sha256 = "159gvzrf4as1fp74czzc14vamhd6s3hlnvwglfgdd5j6d6n37m7s"; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { libsamplerate libsndfile libX11 - SDL - SDL_net + SDL2 + SDL2_net zlib ]; @@ -34,7 +34,38 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - homepage = https://mednafen.github.io/; + longDescription = '' + Mednafen is a portable, utilizing OpenGL and SDL, + argument(command-line)-driven multi-system emulator. Mednafen has the + ability to remap hotkey functions and virtual system inputs to a keyboard, + a joystick, or both simultaneously. Save states are supported, as is + real-time game rewinding. Screen snapshots may be taken, in the PNG file + format, at the press of a button. Mednafen can record audiovisual movies + in the QuickTime file format, with several different lossless codecs + supported. + + The following systems are supported (refer to the emulation module + documentation for more details): + + - Apple II/II+ + - Atari Lynx + - Neo Geo Pocket (Color) + - WonderSwan + - GameBoy (Color) + - GameBoy Advance + - Nintendo Entertainment System + - Super Nintendo Entertainment System/Super Famicom + - Virtual Boy + - PC Engine/TurboGrafx 16 (CD) + - SuperGrafx + - PC-FX + - Sega Game Gear + - Sega Genesis/Megadrive + - Sega Master System + - Sega Saturn (experimental, x86_64 only) + - Sony PlayStation + ''; + homepage = "https://mednafen.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/mednafen/server.nix b/nixpkgs/pkgs/misc/emulators/mednafen/server.nix index 146d5320261..9a1edc00452 100644 --- a/nixpkgs/pkgs/misc/emulators/mednafen/server.nix +++ b/nixpkgs/pkgs/misc/emulators/mednafen/server.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Netplay server for Mednafen"; - homepage = https://mednafen.github.io/; + homepage = "https://mednafen.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix index 40390068e7b..7e231c5edd3 100644 --- a/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mednaffe"; - version = "0.8.6"; + version = "0.8.8"; src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; - rev = "v${version}"; - sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m"; + rev = "${version}"; + sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ]; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "GTK-based frontend for mednafen emulator"; - homepage = https://github.com/AmatCoder/mednaffe; + homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sheenobu yegortimoshenko ]; + maintainers = with maintainers; [ sheenobu yegortimoshenko AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/nixpkgs/pkgs/misc/emulators/mgba/default.nix index c2b30f8ce47..59773764661 100644 --- a/nixpkgs/pkgs/misc/emulators/mgba/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mgba/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig -, cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit -, qttools, minizip }: +, cmake, epoxy, libzip, libelf, libedit, ffmpeg, SDL2, imagemagick +, qtbase, qtmultimedia, qttools, minizip }: let desktopItem = makeDesktopItem { @@ -15,21 +15,21 @@ let }; in stdenv.mkDerivation rec { pname = "mgba"; - version = "0.7.3"; + version = "0.8.1"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1wrmwh50rv8bd328r8cisrihq6h90kx2bfb0vmjfbsd3l1jvgrgm"; + sha256 = "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429"; }; enableParallelBuilding = true; nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ]; buildInputs = [ - libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia libedit minizip - qttools + epoxy libzip libelf libedit ffmpeg SDL2 imagemagick + qtbase qtmultimedia qttools minizip ]; postInstall = '' |