diff options
Diffstat (limited to 'pkgs/applications/emulators')
-rw-r--r-- | pkgs/applications/emulators/cemu/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/emulators/dolphin-emu/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/emulators/lambda-delta/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/emulators/mednafen/default.nix | 99 | ||||
-rw-r--r-- | pkgs/applications/emulators/mednafen/server.nix | 22 | ||||
-rw-r--r-- | pkgs/applications/emulators/mednaffe/default.nix | 42 | ||||
-rw-r--r-- | pkgs/applications/emulators/melonDS/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/emulators/retroarch/hashes.json | 72 | ||||
-rw-r--r-- | pkgs/applications/emulators/retroarch/retroarch-assets.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/emulators/snes9x/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/emulators/wine/sources.nix | 10 |
11 files changed, 51 insertions, 212 deletions
diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 2b3f5e28a8cf8..a51982a19cd4c 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-74"; + version = "2.0-79"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-taV2HEKRUQ7k5BpgA3nwVzX8qkTN02O9kqswjdCHod0="; + hash = "sha256-vSZLiRzOOJJMgycjI5xpgJcUAj5WCz241mAABgNuECw="; }; patches = [ diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index b2a9bbb7bbc40..3f77dcd105f91 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -204,7 +204,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ MP2E ashkitten - xfix ivar ]; }; diff --git a/pkgs/applications/emulators/lambda-delta/default.nix b/pkgs/applications/emulators/lambda-delta/default.nix index a17a0eadfd5b9..cf2001caff32f 100644 --- a/pkgs/applications/emulators/lambda-delta/default.nix +++ b/pkgs/applications/emulators/lambda-delta/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ SDL2 ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-std=c89"; + }; + configureFlags = [ "--without-SDL1" ]; diff --git a/pkgs/applications/emulators/mednafen/default.nix b/pkgs/applications/emulators/mednafen/default.nix deleted file mode 100644 index 816b6c1bd4d7c..0000000000000 --- a/pkgs/applications/emulators/mednafen/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, stdenv -, fetchurl -, SDL2 -, SDL2_net -, alsa-lib -, flac -, freeglut -, libGL -, libGLU -, libX11 -, libcdio -, libjack2 -, libsamplerate -, libsndfile -, pkg-config -, zlib -, libiconv -}: - -stdenv.mkDerivation rec { - pname = "mednafen"; - version = "1.29.0"; - - src = fetchurl { - url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - hash = "sha256-2j+88Ch3+b4PAov6XRy1npU6QEm5D+fjk4ijOG2fNi4="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - SDL2 - SDL2_net - flac - freeglut - libcdio - libjack2 - libsamplerate - libsndfile - zlib - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libGL - libGLU - libX11 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ]; - - hardeningDisable = [ "pic" "format" ]; - - enableParallelBuilding = true; - - postInstall = '' - mkdir -p $out/share/doc - mv Documentation $out/share/doc/mednafen - ''; - - meta = with lib; { - homepage = "https://mednafen.github.io/"; - description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - 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 - ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "mednafen"; - }; -} diff --git a/pkgs/applications/emulators/mednafen/server.nix b/pkgs/applications/emulators/mednafen/server.nix deleted file mode 100644 index 3e11ff41d48d5..0000000000000 --- a/pkgs/applications/emulators/mednafen/server.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "mednafen-server"; - version = "0.5.2"; - - src = fetchurl { - url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz"; - sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq"; - }; - - postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; - - meta = with lib; { - description = "Netplay server for Mednafen"; - mainProgram = "mednafen-server"; - homepage = "https://mednafen.github.io/"; - license = licenses.gpl2; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/emulators/mednaffe/default.nix b/pkgs/applications/emulators/mednaffe/default.nix deleted file mode 100644 index 75a25a4bec3b0..0000000000000 --- a/pkgs/applications/emulators/mednaffe/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, pkg-config -, mednafen -, gtk3 -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "mednaffe"; - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "AmatCoder"; - repo = "mednaffe"; - rev = version; - sha256 = "sha256-zvSAt6CMcgdoPpTTA5sPlQaWUw9LUMsR2Xg9jM2UaWY="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; - - buildInputs = [ gtk3 mednafen ]; - - enableParallelBuilding = true; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH ':' "${mednafen}/bin" - ) - ''; - - meta = with lib; { - description = "GTK-based frontend for mednafen emulator"; - mainProgram = "mednaffe"; - homepage = "https://github.com/AmatCoder/mednaffe"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sheenobu yana AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 0603373dfedd5..bb0499f97277d 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { artemist benley shamilton - xfix ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 3f07ec28fb003..1be9814b5e179 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "9c9b44a7b9b373f2d8f9a3f16bc8373d6469cf98", - "hash": "sha256-XQ7EVPj0Eprs94yjqaUGCphHteRdbcv2nqp3gojYjzc=" + "rev": "ab39d37f868ba8ff3982ce52c4ec22c162888dd7", + "hash": "sha256-Ay3wI9WToSsJNjkNFnHXTt9JUQ6nt+S9jI378E/kK8U=" }, - "version": "unstable-2024-04-12" + "version": "unstable-2024-04-19" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -226,10 +226,10 @@ "src": { "owner": "libretro", "repo": "dolphin", - "rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04", - "hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=" + "rev": "89a4df725d4eb24537728f7d655cddb1add25c18", + "hash": "sha256-f9O3//EuoCSPQC7GWmf0EzAEpjoKof30kIDBCDw0dbs=" }, - "version": "unstable-2022-12-17" + "version": "unstable-2024-04-19" }, "dosbox": { "fetcher": "fetchFromGitHub", @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "97f01ed6075b6034aeb16829a2a259bbe8a254f9", - "hash": "sha256-qXym7CzAXfOSK+hmq6JfCIrq9w11uA2UQ2Ps+lFHrfI=" + "rev": "c821b1008e31d40b6d0464f67a3bc0b1a3da4cce", + "hash": "sha256-yZimJ1eH5Oi+6+4eMtXppj75awCrPXMiWhalsR+Bfik=" }, - "version": "unstable-2024-04-15" + "version": "unstable-2024-04-20" }, "fceumm": { "fetcher": "fetchFromGitHub", @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "7438094d7cdf191e6eb2a39e73cb0f512ea2a714", - "hash": "sha256-T19GJbN/MKC03Q/yS1C6qL5Rv++OlaBol4UYf9//l3s=", + "rev": "3c38fc1f16cc6518db46a5ad350e8b3738eefb48", + "hash": "sha256-NfJJcu7noefSgFlCFCgovnrb6FSzIXu3MGQHu6TCJWo=", "fetchSubmodules": true }, - "version": "unstable-2024-04-12" + "version": "unstable-2024-04-19" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -358,10 +358,10 @@ "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "b063aa81b90682ca89ae6fd1e958bc589b4ce34d", - "hash": "sha256-Tz6if6NfbwvZVDb5Ggr/tXuLNymOjcMkghKwZq6tl6I=" + "rev": "cbacea723690e88e0b11a4b1d0e5b88b1b7eb9d4", + "hash": "sha256-7qFBzATlhf89ILHsEoF+SWwD4Pwd5+08VnK5xU1EDuI=" }, - "version": "unstable-2024-04-05" + "version": "unstable-2024-04-20" }, "gpsp": { "fetcher": "fetchFromGitHub", @@ -438,10 +438,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "7ca870c4168e69819923f73ae0289c38d57b01dc", - "hash": "sha256-eoLzRNsZtIo6Pc9SovQGh9sHxdXhBSQj71RDcQqjji0=" + "rev": "bb864ca20b40908b8fbc49a350939160d6af29f6", + "hash": "sha256-3AvjOpgBh/p0p9xq4rD8xSKqZWzulw7AKUGQ1o9B2Ck=" }, - "version": "unstable-2024-04-13" + "version": "unstable-2024-04-19" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -630,10 +630,10 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "2f326fa15ff26df057ef10da232ebc07a410803a", - "hash": "sha256-mnJJ1NzxZoA3kwfPOyvpP65SKI0I/9FCPNW8TR8NY8k=" + "rev": "e5cb0939ab32d3c3b90b39e2d49a1652a7cf0db1", + "hash": "sha256-K96w3NGXpsnVAmORPdwwhwIJ6PcvaDOEUtLkF4ftX3s=" }, - "version": "unstable-2024-04-14" + "version": "unstable-2024-04-18" }, "picodrive": { "fetcher": "fetchFromGitHub", @@ -651,22 +651,22 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "5c8f4a818be5c1e4df568abfec169c2b08df6674", - "hash": "sha256-IyxqH0ZAAiJ8V9kaVSwhf1zJnVlxhJWghr51AXcvQvs=", + "rev": "57f8a1389f7f2987ab2ad99fdc846663994603ad", + "hash": "sha256-MwqLSTDL6C823grCMRYZrwjhIhbVipAR+4vF5k8UhyE=", "fetchSubmodules": true }, - "version": "unstable-2024-04-10" + "version": "unstable-2024-04-15" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "efe2302548fcbd2dc68c9b5b1fb39dc7976532fd", - "hash": "sha256-zwC3HniJO11/6ApBo0UNn6WMu4Jmj099XaUY4QuKaZI=", + "rev": "1786a4ddb097f7df1c75b55b4c4b163032614371", + "hash": "sha256-nAyGfgSfcJ4dF5oF3FHy+aqzabf9wUOiP0w+GIY1svg=", "fetchSubmodules": true }, - "version": "unstable-2024-04-14" + "version": "unstable-2024-04-20" }, "prboom": { "fetcher": "fetchFromGitHub", @@ -693,10 +693,10 @@ "src": { "owner": "libretro", "repo": "libretro-uae", - "rev": "3c4f02622bd9ab4bbfc5e90cea9c7e60cf410073", - "hash": "sha256-UMbD1RcgQmilBwwzvakUIWWWwg78sl1YT9EOE3Rhyao=" + "rev": "4806716da70cf1f030788b43190d71aae61e2041", + "hash": "sha256-MNqk8ItSC//82HsRfXVYCH+Xd2GV8OA/2heZprx89PY=" }, - "version": "unstable-2024-04-12" + "version": "unstable-2024-04-19" }, "quicknes": { "fetcher": "fetchFromGitHub", @@ -753,10 +753,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "9d22dbb8d866f10042fe564db7dc7b41078a580b", - "hash": "sha256-y2kPj1BugXVZGzyxs0Ph/qM5SMe82kjxnQA25DIpzac=" + "rev": "8077396d399424de89d0a6cc15134523965658e0", + "hash": "sha256-p6apk/8bRKSM3H3hGPr/fYGsDFgMv7syVmTHV0zgmOg=" }, - "version": "unstable-2024-04-13" + "version": "unstable-2024-04-20" }, "snes9x2002": { "fetcher": "fetchFromGitHub", @@ -813,10 +813,10 @@ "src": { "owner": "libretro", "repo": "swanstation", - "rev": "77aeeea58a45cccae7a8be37645f8f5a27ff101b", - "hash": "sha256-z+9Y9hoQ832caip5U+siQXh9GFxLMnX0HcmLa93B/lc=" + "rev": "c7fefb5bfdec2569c2528f8daa6e75b7a3de0880", + "hash": "sha256-dE8F/NXGIEMrdmBWUTzanCSlT0ddkwG8RLZFmy1XvzQ=" }, - "version": "unstable-2024-01-26" + "version": "unstable-2024-04-18" }, "tgbdual": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/pkgs/applications/emulators/retroarch/retroarch-assets.nix index fe9669836624a..eba4a71021969 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-assets.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-assets.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "retroarch-assets"; - version = "unstable-2024-01-02"; + version = "unstable-2024-04-18"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-assets"; - rev = "923b711dc6772a168d83dc8915e9260730fcf3a1"; - hash = "sha256-Hwgga2hCJEdf/j2mU+hLGAsWdYcfuzjCycxSF37I4qk="; + rev = "912f652740986549f41967d615d9da27c325c2b9"; + hash = "sha256-HpmRnbj6CQp7+rmZY46MyT8Ga6832COm1it2z9rKUEU="; }; makeFlags = [ diff --git a/pkgs/applications/emulators/snes9x/default.nix b/pkgs/applications/emulators/snes9x/default.nix index 34c2f72c7dd4a..8f374b7e18183 100644 --- a/pkgs/applications/emulators/snes9x/default.nix +++ b/pkgs/applications/emulators/snes9x/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable // { url = "https://github.com/snes9xgit/snes9x/blob/${version}/LICENSE"; }; - maintainers = with maintainers; [ qknight xfix thiagokokada ]; + maintainers = with maintainers; [ qknight thiagokokada ]; platforms = platforms.unix; broken = (withGtk && stdenv.isDarwin); mainProgram = "snes9x"; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 8efe9c7ab8227..9ee1f53601a3b 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.6"; + version = "9.7"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-Dglg7YK2AX6ILtozOLrRJwoRd7bPBfA6wfqxVavoIEg="; + hash = "sha256-2fPDM2VuiL1M71Mx80sci2nJZKUnWe73RdjdrlGhU1M="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "9.0.0"; + version = "9.1.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-efbEMQBnVWbBEvQZm56nuUTTOBZLNL2R+hGwsKQU4cQ="; + hash = "sha256-igoeaDe0lN9Jkn5ddZscaQjom4ovjjrQJeHCiBiCR24="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-6AKN/KpmsTw9qxErhTTzqWuglgFdOAhtaoBlVRcs71Q="; + hash = "sha256-KU6i1P81Fr+4aZH/SJ+YibaIfX88SZMPdPcGS2mT2CE="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; |