sway: un-extract single-use variable

This commit is contained in:
Andrew Marshall 2024-04-20 12:46:05 -04:00 committed by Robert Helgesson
parent 25479e29d1
commit 76bf779881
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED

View file

@ -331,13 +331,6 @@ let
++ [ cfg.extraConfig ]);
};
defaultSwayPackage = pkgs.sway.override {
extraSessionCommands = cfg.extraSessionCommands;
extraOptions = cfg.extraOptions;
withBaseWrapper = cfg.wrapperFeatures.base;
withGtkWrapper = cfg.wrapperFeatures.gtk;
};
in {
meta.maintainers = with maintainers; [
Scrumplex
@ -357,7 +350,12 @@ in {
package = mkOption {
type = with types; nullOr package;
default = defaultSwayPackage;
default = pkgs.sway.override {
extraSessionCommands = cfg.extraSessionCommands;
extraOptions = cfg.extraOptions;
withBaseWrapper = cfg.wrapperFeatures.base;
withGtkWrapper = cfg.wrapperFeatures.gtk;
};
defaultText = literalExpression "${pkgs.sway}";
description = ''
Sway package to use. Will override the options