Unverified Commit 9cc57574 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #269237 from vs49688/rpcs3-update 

rpcs3: 0.0.28-15409-fd6829f75 -> 0.0.29-15726-ebf48800e
parents c612fc61 4076d988

pkgs/applications/emulators/rpcs3/default.nix→pkgs/by-name/rp/rpcs3/package.nix

+8 −9
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, wrapQtAppsHook

, cmake

, pkg-config

, git

, qtbase

, qtquickcontrols

, qtmultimedia

, qt6Packages

, openal

, glew

, vulkan-headers
@@ -34,10 +31,12 @@ 


let

  # Keep these separate so the update script can regex them

  rpcs3GitVersion = "15409-fd6829f75";

  rpcs3Version = "0.0.28-15409-fd6829f75";

  rpcs3Revision = "fd6829f7576da07e3bb90de8821834d3ce44610c";

  rpcs3Hash = "sha256-I/CYDE7te8xxKjTyH1Mb45uemya5Sfjb96MQWlkFAbk=";

  rpcs3GitVersion = "15726-ebf48800e";

  rpcs3Version = "0.0.29-15726-ebf48800e";

  rpcs3Revision = "ebf48800e6bf2569fa0a59974ab2daaeb3a92f23";

  rpcs3Hash = "sha256-HJQ+DCZy8lwMCfq0N9StKD8bP1hCBxGMAucbQ9esy/I=";



  inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook;

in

stdenv.mkDerivation {

  pname = "rpcs3";
@@ -82,7 +81,7 @@ stdenv.mkDerivation { 
  nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ];



  buildInputs = [

    qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg

    qtbase qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg

    libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM

  ] ++ cubeb.passthru.backendLibs

    ++ lib.optionals faudioSupport [ faudio SDL2 ]

pkgs/applications/emulators/rpcs3/update.sh→pkgs/by-name/rp/rpcs3/update.sh

+1 −1
Original line number Diff line number Diff line
@@ -57,4 +57,4 @@ sed -i -E \ 
    -e "s/rpcs3Version\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3Version = \"${final_ver}\";/g" \

    -e "s/rpcs3Revision\s*=\s*\"[a-z0-9]+\";$/rpcs3Revision = \"${commit_sha}\";/g" \

    -e "s|rpcs3Hash\s*=\s*\"sha256-.*\";$|rpcs3Hash = \"${nix_hash}\";|g" \

    "$ROOT/default.nix"
 
    "$ROOT/package.nix"