Skip to content

wlroots: 0.14.1 -> 0.15.0 #151234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
primeos merged 2 commits into from
Dec 23, 2021
+102 −14
Merged

wlroots: 0.14.1 -> 0.15.0 #151234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc6c379
wlroots_0_14: init at 0.14.1
primeos Dec 22, 2021
63d7ba6
wlroots: 0.14.1 -> 0.15.0
primeos Dec 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...development/libraries/wlroots/default.nix → pkgs/development/libraries/wlroots/0.14.nix
View file
Open in desktop
File renamed without changes.
64 changes: 64 additions & 0 deletions pkgs/development/libraries/wlroots/0.15.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{ lib, stdenv, fetchFromGitLab, meson_0_60, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
, libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang

, enableXWayland ? true, xwayland ? null
}:

stdenv.mkDerivation rec {
pname = "wlroots";
version = "0.15.0";

src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = version;
sha256 = "0wdzs0wpv61pxgy3mx3xjsndyfmbj30v47d3w9ymmnd4r479n41n";
};

# $out for the library and $examples for the example programs (in examples):
outputs = [ "out" "examples" ];

depsBuildBuild = [ pkg-config ];

nativeBuildInputs = [ meson_0_60 ninja pkg-config wayland-scanner ];

buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
libpng ffmpeg xcbutilrenderutil seatd vulkan-loader glslang
]
++ lib.optional enableXWayland xwayland
;

mesonFlags =
lib.optional (!enableXWayland) "-Dxwayland=disabled"
;

postFixup = ''
# Install ALL example programs to $examples:
# screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
# screenshot output-layout multi-pointer rotation tablet touch pointer
# simple
mkdir -p $examples/bin
cd ./examples
for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
cp "$binary" "$examples/bin/wlroots-$binary"
done
'';

meta = with lib; {
description = "A modular Wayland compositor library";
longDescription = ''
Pluggable, composable, unopinionated modules for building a Wayland
compositor; or about 50,000 lines of code you were going to write anyway.
'';
inherit (src.meta) homepage;
changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos synthetica ];
};
}
48 changes: 35 additions & 13 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3586,7 +3586,9 @@ with pkgs;

reg = callPackage ../tools/virtualization/reg { };

river = callPackage ../applications/window-managers/river { };
river = callPackage ../applications/window-managers/river {
wlroots = wlroots_0_14;
};

rmapi = callPackage ../applications/misc/remarkable/rmapi { };

Expand Down Expand Up @@ -24459,7 +24461,9 @@ with pkgs;

cardboard = callPackage ../applications/window-managers/cardboard { };

cage = callPackage ../applications/window-managers/cage { };
cage = callPackage ../applications/window-managers/cage {
wlroots = wlroots_0_14;
};

calf = callPackage ../applications/audio/calf {
inherit (gnome2) libglade;
Expand Down Expand Up @@ -24866,7 +24870,9 @@ with pkgs;

dyff = callPackage ../development/tools/dyff {};

dwl = callPackage ../applications/window-managers/dwl { };
dwl = callPackage ../applications/window-managers/dwl {
wlroots = wlroots_0_14;
};

dwm = callPackage ../applications/window-managers/dwm {
# dwm is configured entirely through source modification. Allow users to
Expand Down Expand Up @@ -26071,13 +26077,18 @@ with pkgs;

super-productivity = callPackage ../applications/office/super-productivity { };

wlroots = callPackage ../development/libraries/wlroots {
wlroots = wlroots_0_15;
wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix {
inherit (xorg) xcbutilrenderutil;
};
wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix {
inherit (xorg) xcbutilrenderutil;
};

wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};

sway-unwrapped = callPackage ../applications/window-managers/sway { };
sway-unwrapped = callPackage ../applications/window-managers/sway {
wlroots = wlroots_0_14;
};
sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
swayidle = callPackage ../applications/window-managers/sway/idle.nix { };
Expand All @@ -26097,7 +26108,9 @@ with pkgs;

wbg = callPackage ../applications/misc/wbg { };

hikari = callPackage ../applications/window-managers/hikari { };
hikari = callPackage ../applications/window-managers/hikari {
wlroots = wlroots_0_14;
};

i3 = callPackage ../applications/window-managers/i3 {
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
Expand Down Expand Up @@ -26161,7 +26174,9 @@ with pkgs;

i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };

waybox = callPackage ../applications/window-managers/waybox { };
waybox = callPackage ../applications/window-managers/waybox {
wlroots = wlroots_0_14;
};

workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };

Expand Down Expand Up @@ -26623,7 +26638,9 @@ with pkgs;

lame = callPackage ../development/libraries/lame { };

labwc = callPackage ../applications/window-managers/labwc { };
labwc = callPackage ../applications/window-managers/labwc {
wlroots = wlroots_0_14;
};

larswm = callPackage ../applications/window-managers/larswm { };

Expand Down Expand Up @@ -29295,7 +29312,8 @@ with pkgs;
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_14; })
);
wayfirePlugins = recurseIntoAttrs (
callPackage ../applications/window-managers/wayfire/plugins.nix {
Expand Down Expand Up @@ -29349,7 +29367,9 @@ with pkgs;
electron = electron_14;
};

wio = callPackage ../applications/window-managers/wio { };
wio = callPackage ../applications/window-managers/wio {
wlroots = wlroots_0_14;
};

whitebox-tools = callPackage ../applications/gis/whitebox-tools {
inherit (darwin.apple_sdk.frameworks) Security;
Expand Down Expand Up @@ -34030,7 +34050,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit;
};

cagebreak = callPackage ../applications/window-managers/cagebreak { };
cagebreak = callPackage ../applications/window-managers/cagebreak {
wlroots = wlroots_0_14;
};

psftools = callPackage ../os-specific/linux/psftools {};

Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8092,7 +8092,9 @@ in {

pywizlight = callPackage ../development/python-modules/pywizlight { };

pywlroots = callPackage ../development/python-modules/pywlroots { };
pywlroots = callPackage ../development/python-modules/pywlroots {
wlroots = pkgs.wlroots_0_14;
};

pyxattr = callPackage ../development/python-modules/pyxattr { };

Expand Down