movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

sway-unwrapped: 1.9 -> 1.10 (#351752)

Browse source
This commit is contained in:
Aleksana 2024-10-30 16:45:51 +08:00 • committed by GitHub
commit 3b2ebbb33f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/programs/wayland/sway.nix
View file

@ -85,9 +85,10 @@ in
extraPackages = lib.mkOption { extraPackages = lib.mkOption {
type = with lib.types; listOf package; type = with lib.types; listOf package;
default = with pkgs; [ swaylock swayidle foot dmenu wmenu ]; # Packages used in default config
default = with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ];
defaultText = lib.literalExpression '' defaultText = lib.literalExpression ''
with pkgs; [ swaylock swayidle foot dmenu wmenu ]; with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ];
''; '';
example = lib.literalExpression '' example = lib.literalExpression ''
with pkgs; [ i3status i3status-rust termite rofi light ] with pkgs; [ i3status i3status-rust termite rofi light ]

5
pkgs/by-name/sw/sway-unwrapped/package.nix
View file

@ -13,14 +13,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "sway-unwrapped"; pname = "sway-unwrapped";
version = "1.9"; version = "1.10";
inherit enableXWayland isNixOS systemdSupport trayEnabled; inherit enableXWayland isNixOS systemdSupport trayEnabled;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "swaywm"; owner = "swaywm";
repo = "sway"; repo = "sway";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-/6+iDkQfdLcL/pTJaqNc6QdP4SRVOYLjfOItEu/bZtg="; hash = "sha256-PzeU/niUdqI6sf2TCG19G2vNgAZJE5JCyoTwtO9uFTk=";
}; };
patches = [ patches = [
@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; sd-bus-provider = if systemdSupport then "libsystemd" else "basu";
in [ in [
(mesonOption "sd-bus-provider" sd-bus-provider) (mesonOption "sd-bus-provider" sd-bus-provider)
(mesonEnable "xwayland" finalAttrs.enableXWayland)
(mesonEnable "tray" finalAttrs.trayEnabled) (mesonEnable "tray" finalAttrs.trayEnabled)
]; ];

2
pkgs/top-level/all-packages.nix
View file

@ -4412,7 +4412,7 @@ with pkgs;
shotman = callPackage ../tools/wayland/shotman { }; shotman = callPackage ../tools/wayland/shotman { };
sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
wlroots = wlroots_0_17; wlroots = wlroots_0_18;
}; };
swayr = callPackage ../tools/wayland/swayr { }; swayr = callPackage ../tools/wayland/swayr { };