From e468e3b9e2979fb10bb9783964d9d720a46ff155 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 1 Mar 2024 15:59:37 +0100 Subject: [PATCH] rpcs3: add `USE_SDL` and `USE_DISCORD_RPC` flags --- pkgs/by-name/rp/rpcs3/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index d65e6bfad137..058d95bb4414 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -22,6 +22,7 @@ , flatbuffers , llvm_16 , cubeb +, enableDiscordRpc ? false , faudioSupport ? true , faudio , SDL2 @@ -72,9 +73,11 @@ stdenv.mkDerivation { (lib.cmakeBool "USE_SYSTEM_PUGIXML" true) (lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true) (lib.cmakeBool "USE_SYSTEM_SDL" true) + (lib.cmakeBool "USE_SDL" true) (lib.cmakeBool "WITH_LLVM" true) (lib.cmakeBool "BUILD_LLVM" false) (lib.cmakeBool "USE_NATIVE_INSTRUCTIONS" false) + (lib.cmakeBool "USE_DISCORD_RPC" enableDiscordRpc) (lib.cmakeBool "USE_FAUDIO" faudioSupport) ]; @@ -82,9 +85,9 @@ stdenv.mkDerivation { buildInputs = [ qtbase qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM + libevdev zlib libusb1 curl wolfssl python3 pugixml SDL2 flatbuffers llvm_16 libSM ] ++ cubeb.passthru.backendLibs - ++ lib.optionals faudioSupport [ faudio SDL2 ] + ++ lib.optional faudioSupport faudio ++ lib.optionals waylandSupport [ wayland qtwayland ]; postInstall = ''