public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #128459 from Ma27/backport-sway

Browse Source 
[21.05] sway: 1.6 -> 1.6.1, wlroots: 0.13.0 -> 0.14.0
This commit is contained in:
Anderson Torres
2021-07-08 11:30:06 -03:00
committed by GitHub
parent 455ec36268 4dab07340d
commit 5436a1fd65
9 changed files with 138 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+9 -3
View File
@@ -24206,6 +24206,7 @@ in
};
wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
wlroots_0_13 = callPackage ../development/libraries/wlroots/0.13.nix {};
sway-unwrapped = callPackage ../applications/window-managers/sway { };
sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
@@ -24227,7 +24228,9 @@ in
wbg = callPackage ../applications/misc/wbg { };
hikari = callPackage ../applications/window-managers/hikari { };
hikari = callPackage ../applications/window-managers/hikari {
wlroots = wlroots_0_13;
};
i3 = callPackage ../applications/window-managers/i3 {
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
@@ -27202,7 +27205,8 @@ in
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
inherit (wayfireApplications) wayfire wcm;
wayfireApplications-unwrapped = recurseIntoAttrs (
callPackage ../applications/window-managers/wayfire/applications.nix { }
(callPackage ../applications/window-managers/wayfire/applications.nix { }).
extend (_: _: { wlroots = wlroots_0_13; })
);
wayfirePlugins = recurseIntoAttrs (
callPackage ../applications/window-managers/wayfire/plugins.nix {
@@ -27252,7 +27256,9 @@ in
weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
wio = callPackage ../applications/window-managers/wio { };
wio = callPackage ../applications/window-managers/wio {
wlroots = wlroots_0_13;
};
whitebox-tools = callPackage ../applications/gis/whitebox-tools {
inherit (darwin.apple_sdk.frameworks) Security;