From 69fce48b0d6654ab74618fcbf575a2e6d9498bac Mon Sep 17 00:00:00 2001 From: "Emil \"AngryAnt\" Johansen" Date: Tue, 9 May 2023 12:35:34 +0200 Subject: [PATCH] rusty-psn-gui: fix build, lib.optionals --- pkgs/applications/misc/rusty-psn/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix index fbea2a7b8037..d9e713b0abf7 100644 --- a/pkgs/applications/misc/rusty-psn/default.nix +++ b/pkgs/applications/misc/rusty-psn/default.nix @@ -5,6 +5,11 @@ , makeDesktopItem , copyDesktopItems , pkg-config +, cmake +, fontconfig +, glib +, gtk3 +, freetype , openssl , xorg , libGL @@ -26,10 +31,18 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config + ] ++ lib.optionals withGui [ copyDesktopItems + cmake ]; - buildInputs = if withGui then [ + buildInputs = [ + openssl + ] ++ lib.optionals withGui [ + fontconfig + glib + gtk3 + freetype openssl xorg.libxcb xorg.libX11 @@ -39,8 +52,6 @@ rustPlatform.buildRustPackage rec { xorg.libxcb libGL libGL.dev - ] else [ - openssl ]; buildNoDefaultFeatures = true;