Merge pull request #147622 from thiagokokada/libretro-pcsx2

libretro.pcsx2: init at unstable-2021-11-27

authored by Thiago Kenji Okada and committed by GitHub d6312c26 97724e99

+49 -7
+40 -6
pkgs/misc/emulators/retroarch/cores.nix
··· 14 , hexdump 15 , hidapi 16 , icu 17 , libGL 18 , libGLU 19 , libevdev ··· 21 , libpcap 22 , libpng 23 , libvorbis 24 , libzip 25 , makeWrapper 26 , nasm ··· 36 , udev 37 , which 38 , xorg 39 , zlib 40 }: 41 ··· 55 , src ? null 56 , broken ? false 57 , version ? "unstable-2021-11-22" 58 , ... 59 }@args: 60 lib.makeOverridable stdenv.mkDerivation ( ··· 105 }; 106 107 meta = with lib; { 108 - inherit broken description license; 109 homepage = "https://www.libretro.com/"; 110 maintainers = with maintainers; [ edwtjo hrdinka MP2E thiagokokada ]; 111 - platforms = platforms.unix; 112 }; 113 }) // builtins.removeAttrs args [ "core" "src" "description" "license" "makeFlags" ] 114 ); ··· 189 description = "Port of Mednafen's Saturn core to libretro"; 190 license = lib.licenses.gpl2Only; 191 makefile = "Makefile"; 192 - meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; 193 }; 194 195 beetle-snes = mkLibRetroCore { ··· 363 ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); 364 makefile = "Makefile"; 365 cmakeFlags = [ 366 - "-DCMAKE_BUILD_TYPE=Release" 367 "-DLIBRETRO=ON" 368 "-DLIBRETRO_STATIC=1" 369 "-DENABLE_QT=OFF" ··· 420 extraBuildInputs = [ libGL libGLU ]; 421 makefile = "Makefile"; 422 makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; 423 - meta.platforms = [ "aarch64-linux" "x86_64-linux" ]; 424 }; 425 426 fmsx = mkLibRetroCore { ··· 669 ''; 670 }; 671 672 pcsx_rearmed = mkLibRetroCore { 673 core = "pcsx_rearmed"; 674 description = "Port of PCSX ReARMed with GNU lightning to libretro"; ··· 810 extraNativeBuildInputs = [ cmake ]; 811 makefile = "Makefile"; 812 cmakeFlags = [ 813 - "-DCMAKE_BUILD_TYPE=Release" 814 "-DBUILD_LIBRETRO_CORE=ON" 815 ]; 816 postPatch = "mkdir -p src/duckstation-libretro";
··· 14 , hexdump 15 , hidapi 16 , icu 17 + , libaio 18 , libGL 19 , libGLU 20 , libevdev ··· 22 , libpcap 23 , libpng 24 , libvorbis 25 + , libxml2 26 , libzip 27 , makeWrapper 28 , nasm ··· 38 , udev 39 , which 40 , xorg 41 + , xxd 42 + , xz 43 , zlib 44 }: 45 ··· 59 , src ? null 60 , broken ? false 61 , version ? "unstable-2021-11-22" 62 + , platforms ? retroarch.meta.platforms 63 , ... 64 }@args: 65 lib.makeOverridable stdenv.mkDerivation ( ··· 110 }; 111 112 meta = with lib; { 113 + inherit broken description license platforms; 114 homepage = "https://www.libretro.com/"; 115 maintainers = with maintainers; [ edwtjo hrdinka MP2E thiagokokada ]; 116 }; 117 }) // builtins.removeAttrs args [ "core" "src" "description" "license" "makeFlags" ] 118 ); ··· 193 description = "Port of Mednafen's Saturn core to libretro"; 194 license = lib.licenses.gpl2Only; 195 makefile = "Makefile"; 196 + platforms = [ "x86_64-linux" "aarch64-linux" ]; 197 }; 198 199 beetle-snes = mkLibRetroCore { ··· 367 ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); 368 makefile = "Makefile"; 369 cmakeFlags = [ 370 "-DLIBRETRO=ON" 371 "-DLIBRETRO_STATIC=1" 372 "-DENABLE_QT=OFF" ··· 423 extraBuildInputs = [ libGL libGLU ]; 424 makefile = "Makefile"; 425 makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; 426 + platforms = [ "aarch64-linux" "x86_64-linux" ]; 427 }; 428 429 fmsx = mkLibRetroCore { ··· 672 ''; 673 }; 674 675 + pcsx2 = mkLibRetroCore { 676 + core = "pcsx2"; 677 + version = "unstable-2021-11-27"; 678 + description = "Port of PCSX2 to libretro"; 679 + license = lib.licenses.gpl3Plus; 680 + extraNativeBuildInputs = [ 681 + cmake 682 + gettext 683 + pkg-config 684 + ]; 685 + extraBuildInputs = [ 686 + libaio 687 + libGL 688 + libGLU 689 + libpcap 690 + libpng 691 + libxml2 692 + xz 693 + xxd 694 + ]; 695 + makefile = "Makefile"; 696 + cmakeFlags = [ 697 + "-DLIBRETRO=ON" 698 + ]; 699 + postPatch = '' 700 + # remove ccache 701 + substituteInPlace CMakeLists.txt --replace "ccache" "" 702 + ''; 703 + postBuild = "cd /build/source/build/pcsx2"; 704 + platforms = lib.platforms.x86; 705 + }; 706 + 707 pcsx_rearmed = mkLibRetroCore { 708 core = "pcsx_rearmed"; 709 description = "Port of PCSX ReARMed with GNU lightning to libretro"; ··· 845 extraNativeBuildInputs = [ cmake ]; 846 makefile = "Makefile"; 847 cmakeFlags = [ 848 "-DBUILD_LIBRETRO_CORE=ON" 849 ]; 850 postPatch = "mkdir -p src/duckstation-libretro";
+1 -1
pkgs/misc/emulators/retroarch/default.nix
··· 110 homepage = "https://libretro.com"; 111 description = "Multi-platform emulator frontend for libretro cores"; 112 license = licenses.gpl3Plus; 113 - platforms = platforms.all; 114 maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ]; 115 # FIXME: exits with error on macOS: 116 # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting
··· 110 homepage = "https://libretro.com"; 111 description = "Multi-platform emulator frontend for libretro cores"; 112 license = licenses.gpl3Plus; 113 + platforms = platforms.unix; 114 maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ]; 115 # FIXME: exits with error on macOS: 116 # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting
+7
pkgs/misc/emulators/retroarch/hashes.json
··· 377 "sha256": "rms+T8JOp/TJ/T5a5uLj8lu1LLz/GAsJZ7UbK42C9yU=", 378 "fetchSubmodules": false 379 }, 380 "pcsx_rearmed": { 381 "owner": "libretro", 382 "repo": "pcsx_rearmed",
··· 377 "sha256": "rms+T8JOp/TJ/T5a5uLj8lu1LLz/GAsJZ7UbK42C9yU=", 378 "fetchSubmodules": false 379 }, 380 + "pcsx2": { 381 + "owner": "libretro", 382 + "repo": "pcsx2", 383 + "rev": "18e0685ed4f191796c8e923caf4f5e96a930057e", 384 + "sha256": "V2eS741us2p+JC+ghmHjAtFeptB0UcBlwZuisZ8Co7M=", 385 + "fetchSubmodules": false 386 + }, 387 "pcsx_rearmed": { 388 "owner": "libretro", 389 "repo": "pcsx_rearmed",
+1
pkgs/misc/emulators/retroarch/update.py
··· 64 "o2em": {"repo": "libretro-o2em"}, 65 "opera": {"repo": "opera-libretro"}, 66 "parallel-n64": {"repo": "parallel-n64"}, 67 "pcsx_rearmed": {"repo": "pcsx_rearmed"}, 68 "picodrive": {"repo": "picodrive", "fetch_submodules": True}, 69 "play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True},
··· 64 "o2em": {"repo": "libretro-o2em"}, 65 "opera": {"repo": "opera-libretro"}, 66 "parallel-n64": {"repo": "parallel-n64"}, 67 + "pcsx2": {"repo": "pcsx2"}, 68 "pcsx_rearmed": {"repo": "pcsx_rearmed"}, 69 "picodrive": {"repo": "picodrive", "fetch_submodules": True}, 70 "play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True},