From 0aad9cdd465a6e9e55b489c3925df988fb5bf1d6 Mon Sep 17 00:00:00 2001 From: nat Date: Sun, 13 Apr 2025 02:55:39 +0200 Subject: [PATCH 1/2] rusty-psn-gui: add mainProgram --- pkgs/by-name/ru/rusty-psn/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index 8dffbc41719c..cdc0a2f7949c 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -96,6 +96,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ AngryAnt ]; - mainProgram = "rusty-psn"; + mainProgram = if withGui then "rusty-psn-gui" else "rusty-psn"; }; } From bcfa37cdae31c86f423f831ece0ed2bcd4e63613 Mon Sep 17 00:00:00 2001 From: nat Date: Sun, 13 Apr 2025 03:05:15 +0200 Subject: [PATCH 2/2] rusty-psn-gui: fix running on wayland --- pkgs/by-name/ru/rusty-psn/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index cdc0a2f7949c..1e56bdd52f9a 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -13,6 +13,8 @@ openssl, xorg, libGL, + libxkbcommon, + wayland, withGui ? false, # build GUI version }: @@ -59,6 +61,8 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libxcb libGL + libxkbcommon + wayland ]; buildNoDefaultFeatures = true;