From 97bb5f8064f0d514b3df278eef730d5b5ec943c2 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 29 Feb 2024 21:28:33 +0100 Subject: [PATCH 1/2] citra: use lib.cmakeBool --- pkgs/applications/emulators/citra/generic.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index c167aef7e774..d855d334247c 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -72,23 +72,25 @@ stdenv.mkDerivation { ++ lib.optional useDiscordRichPresence rapidjson; cmakeFlags = [ - "-DUSE_SYSTEM_LIBS=ON" + (lib.cmakeBool "USE_SYSTEM_LIBS" true) - "-DDISABLE_SYSTEM_DYNARMIC=ON" - "-DDISABLE_SYSTEM_GLSLANG=ON" # The following imported targets are referenced, but are missing: SPIRV-Tools-opt - "-DDISABLE_SYSTEM_LODEPNG=ON" # Not packaged in nixpkgs - "-DDISABLE_SYSTEM_VMA=ON" - "-DDISABLE_SYSTEM_XBYAK=ON" + (lib.cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) + (lib.cmakeBool "DISABLE_SYSTEM_GLSLANG" true) # The following imported targets are referenced, but are missing: SPIRV-Tools-opt + (lib.cmakeBool "DISABLE_SYSTEM_LODEPNG" true) # Not packaged in nixpkgs + (lib.cmakeBool "DISABLE_SYSTEM_VMA" true) + (lib.cmakeBool "DISABLE_SYSTEM_XBYAK" true) # We don't want to bother upstream with potentially outdated compat reports - "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON" - "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically - ] ++ lib.optional (!enableSdl2Frontend) "-DENABLE_SDL2_FRONTEND=OFF" - ++ lib.optional (!enableQt) "-DENABLE_QT=OFF" - ++ lib.optional enableQtTranslation "-DENABLE_QT_TRANSLATION=ON" - ++ lib.optional (!enableWebService) "-DENABLE_WEB_SERVICE=OFF" - ++ lib.optional (!enableCubeb) "-DENABLE_CUBEB=OFF" - ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON"; + (lib.cmakeBool "CITRA_ENABLE_COMPATIBILITY_REPORTING" true) + (lib.cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false) # We provide this deterministically + + (lib.cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) + (lib.cmakeBool "ENABLE_QT" enableQt) + (lib.cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslation) + (lib.cmakeBool "ENABLE_WEB_SERVICE" enableWebService) + (lib.cmakeBool "ENABLE_CUBEB" enableCubeb) + (lib.cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) + ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; From e87ec1228f1a7315c6dc15ace10fc097c1108f30 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 1 Mar 2024 15:55:23 +0100 Subject: [PATCH 2/2] citra: default Discord RPC to false --- pkgs/applications/emulators/citra/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index d855d334247c..d247a181e07c 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -34,7 +34,7 @@ , enableQtTranslation ? enableQt, qttools , enableWebService ? true , enableCubeb ? true, cubeb -, useDiscordRichPresence ? true, rapidjson +, useDiscordRichPresence ? false, rapidjson }: stdenv.mkDerivation { inherit pname version src;