From f5110c71823355b7ec63f4bb171ebf4eba8bf4b9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 19 Nov 2022 00:00:00 -0300 Subject: [PATCH] duckstation: remove unneeded rec Also, adds a controlling flag enableWayland. --- .../emulators/duckstation/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 88deb6653a02..31869fa9fe36 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -4,11 +4,11 @@ , SDL2 , cmake , copyDesktopItems -, makeDesktopItem , curl , extra-cmake-modules -, libpulseaudio , libXrandr +, libpulseaudio +, makeDesktopItem , mesa # for libgbm , ninja , pkg-config @@ -18,14 +18,16 @@ , vulkan-loader , wayland , wrapQtAppsHook +, enableWayland ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "duckstation"; version = "unstable-2022-11-18"; + src = fetchFromGitHub { owner = "stenzek"; - repo = pname; + repo = "duckstation"; rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b"; sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4="; }; @@ -49,13 +51,13 @@ stdenv.mkDerivation rec { qtbase qtsvg vulkan-loader - wayland - ]; + ] + ++ lib.optionals enableWayland [ wayland ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" - "-DUSE_WAYLAND=ON" - ]; + ] + ++ lib.optionals enableWayland [ "-DUSE_WAYLAND=ON" ]; desktopItems = [ (makeDesktopItem {