Unverified Commit 106e145e authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #324909 from matteo4375/rpcs3-add-gapps-hook 

rpcs3: add gapps hook to fix crashing when opening file picker
parents 937aae9b 8d3dcbe3

pkgs/by-name/rp/rpcs3/package.nix

+8 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
, SDL2

, waylandSupport ? true

, wayland

, wrapGAppsHook3

}:



let
@@ -81,7 +82,9 @@ stdenv.mkDerivation { 
    (lib.cmakeBool "USE_FAUDIO" faudioSupport)

  ];



  nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ];

  dontWrapGApps = true;



  nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook wrapGAppsHook3 ];



  buildInputs = [

    qtbase qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
@@ -90,6 +93,10 @@ stdenv.mkDerivation { 
    ++ lib.optional faudioSupport faudio

    ++ lib.optionals waylandSupport [ wayland qtwayland ];



  preFixup = ''

    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  postInstall = ''

    # Taken from https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration

    install -D ${./99-ds3-controllers.rules} $out/etc/udev/rules.d/99-ds3-controllers.rules