Merge pull request #230854 from AngryAnt/rusty-psn-gui-fix

rusty-psn-gui: fix build, cleanup
This commit is contained in:
Weijia Wang 2023-05-10 13:25:34 +03:00 committed by GitHub
commit 249c54b8ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;