wlroots_0_12: init at 0.12.0
Uses the old wlroots in places where the new one isn't yet compatible. Co-authored-by: Alyssa Ross <hi@alyssa.is> Co-authored-by: Michael Weiss <dev.primeos@gmail.com>
This commit is contained in:
parent
18165d6411
commit
49299adf4e
@ -1,7 +1,6 @@
|
|||||||
{ newScope, wayfirePlugins }:
|
{ lib, newScope, wayfirePlugins }:
|
||||||
|
|
||||||
let
|
lib.makeExtensible (self: with self; {
|
||||||
self = with self; {
|
|
||||||
inherit wayfirePlugins;
|
inherit wayfirePlugins;
|
||||||
|
|
||||||
callPackage = newScope self;
|
callPackage = newScope self;
|
||||||
@ -18,6 +17,4 @@ let
|
|||||||
wayfire = wrapWayfireApplication wayfire selector;
|
wayfire = wrapWayfireApplication wayfire selector;
|
||||||
wcm = wrapWayfireApplication wcm selector;
|
wcm = wrapWayfireApplication wcm selector;
|
||||||
};
|
};
|
||||||
};
|
})
|
||||||
in
|
|
||||||
self
|
|
||||||
|
57
pkgs/development/libraries/wlroots/0.12.nix
Normal file
57
pkgs/development/libraries/wlroots/0.12.nix
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
|
||||||
|
, libGL, wayland-protocols, libinput, libxkbcommon, pixman
|
||||||
|
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
|
||||||
|
, libpng, ffmpeg
|
||||||
|
}:
|
||||||
|
|
||||||
|
# Fixed version derivation.
|
||||||
|
# nixpkgs-update: no auto update
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "wlroots";
|
||||||
|
version = "0.12.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "swaywm";
|
||||||
|
repo = "wlroots";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn";
|
||||||
|
};
|
||||||
|
|
||||||
|
# $out for the library and $examples for the example programs (in examples):
|
||||||
|
outputs = [ "out" "examples" ];
|
||||||
|
|
||||||
|
nativeBuildInputs = [ meson ninja pkg-config wayland ];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
libGL wayland wayland-protocols libinput libxkbcommon pixman
|
||||||
|
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
|
||||||
|
libpng ffmpeg
|
||||||
|
];
|
||||||
|
|
||||||
|
mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=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://github.com/swaywm/wlroots/releases/tag/${version}";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ primeos ];
|
||||||
|
};
|
||||||
|
}
|
@ -22038,7 +22038,9 @@ in
|
|||||||
|
|
||||||
caerbannog = callPackage ../applications/misc/caerbannog { };
|
caerbannog = callPackage ../applications/misc/caerbannog { };
|
||||||
|
|
||||||
cage = callPackage ../applications/window-managers/cage { };
|
cage = callPackage ../applications/window-managers/cage {
|
||||||
|
wlroots = wlroots_0_12;
|
||||||
|
};
|
||||||
|
|
||||||
calf = callPackage ../applications/audio/calf {
|
calf = callPackage ../applications/audio/calf {
|
||||||
inherit (gnome2) libglade;
|
inherit (gnome2) libglade;
|
||||||
@ -23479,6 +23481,8 @@ in
|
|||||||
|
|
||||||
wlroots = callPackage ../development/libraries/wlroots { };
|
wlroots = callPackage ../development/libraries/wlroots { };
|
||||||
|
|
||||||
|
wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
|
||||||
|
|
||||||
sway-unwrapped = callPackage ../applications/window-managers/sway { };
|
sway-unwrapped = callPackage ../applications/window-managers/sway { };
|
||||||
sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
|
sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
|
||||||
swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
|
swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
|
||||||
@ -23499,7 +23503,9 @@ in
|
|||||||
|
|
||||||
wbg = callPackage ../applications/misc/wbg { };
|
wbg = callPackage ../applications/misc/wbg { };
|
||||||
|
|
||||||
hikari = callPackage ../applications/window-managers/hikari { };
|
hikari = callPackage ../applications/window-managers/hikari {
|
||||||
|
wlroots = wlroots_0_12;
|
||||||
|
};
|
||||||
|
|
||||||
i3 = callPackage ../applications/window-managers/i3 {
|
i3 = callPackage ../applications/window-managers/i3 {
|
||||||
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
|
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
|
||||||
@ -23561,7 +23567,9 @@ in
|
|||||||
|
|
||||||
i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
|
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_12;
|
||||||
|
};
|
||||||
|
|
||||||
windowchef = callPackage ../applications/window-managers/windowchef/default.nix { };
|
windowchef = callPackage ../applications/window-managers/windowchef/default.nix { };
|
||||||
|
|
||||||
@ -26432,10 +26440,15 @@ in
|
|||||||
|
|
||||||
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
|
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
|
||||||
inherit (wayfireApplications) wayfire wcm;
|
inherit (wayfireApplications) wayfire wcm;
|
||||||
wayfireApplications-unwrapped = recurseIntoAttrs (callPackage ../applications/window-managers/wayfire/applications.nix { });
|
wayfireApplications-unwrapped = recurseIntoAttrs (
|
||||||
wayfirePlugins = recurseIntoAttrs (callPackage ../applications/window-managers/wayfire/plugins.nix {
|
(callPackage ../applications/window-managers/wayfire/applications.nix { }).
|
||||||
|
extend (_: _: { wlroots = wlroots_0_12; })
|
||||||
|
);
|
||||||
|
wayfirePlugins = recurseIntoAttrs (
|
||||||
|
callPackage ../applications/window-managers/wayfire/plugins.nix {
|
||||||
inherit (wayfireApplications-unwrapped) wayfire;
|
inherit (wayfireApplications-unwrapped) wayfire;
|
||||||
});
|
}
|
||||||
|
);
|
||||||
wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { };
|
wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { };
|
||||||
|
|
||||||
waypipe = callPackage ../applications/networking/remote/waypipe { };
|
waypipe = callPackage ../applications/networking/remote/waypipe { };
|
||||||
@ -26477,7 +26490,9 @@ in
|
|||||||
|
|
||||||
weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
|
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_12;
|
||||||
|
};
|
||||||
|
|
||||||
whitebox-tools = callPackage ../applications/gis/whitebox-tools {
|
whitebox-tools = callPackage ../applications/gis/whitebox-tools {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
@ -30806,7 +30821,9 @@ in
|
|||||||
|
|
||||||
bottom = callPackage ../tools/system/bottom {};
|
bottom = callPackage ../tools/system/bottom {};
|
||||||
|
|
||||||
cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {};
|
cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {
|
||||||
|
wlroots = wlroots_0_12;
|
||||||
|
};
|
||||||
|
|
||||||
psftools = callPackage ../os-specific/linux/psftools {};
|
psftools = callPackage ../os-specific/linux/psftools {};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user