git.iko.soy/typeable/nixpkgs
on master help sign in
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>

commit49299adf4e95037c1692fca941d6370e453e2855 authorPatrick Hilhorst <git@hilhorst.be> dateFri 26 Mar 2021, 13:07 (6 years ago) parent18165d6
3 files changed+96−25
pkgs/applications/window-managers/wayfire/applications.nix+13−16 pkgs/development/libraries/wlroots/0.12.nix+57 pkgs/top-level/all-packages.nix+26−9
pkgs/applications/window-managers/wayfire/applications.nix+13−16
@@ -1,23 +1,20 @@
1−{ newScope, wayfirePlugins }:
1+{ lib, newScope, wayfirePlugins }:
22
3−let
4− self = with self; {
5− inherit wayfirePlugins;
3+lib.makeExtensible (self: with self; {
4+ inherit wayfirePlugins;
65
7− callPackage = newScope self;
6+ callPackage = newScope self;
87
9− wayfire = callPackage ./. { };
8+ wayfire = callPackage ./. { };
109
11− wcm = callPackage ./wcm.nix {
12− inherit (wayfirePlugins) wf-shell;
13− };
10+ wcm = callPackage ./wcm.nix {
11+ inherit (wayfirePlugins) wf-shell;
12+ };
1413
15− wrapWayfireApplication = callPackage ./wrapper.nix { };
14+ wrapWayfireApplication = callPackage ./wrapper.nix { };
1615
17− withPlugins = selector: self // {
18− wayfire = wrapWayfireApplication wayfire selector;
19− wcm = wrapWayfireApplication wcm selector;
20− };
16+ withPlugins = selector: self // {
17+ wayfire = wrapWayfireApplication wayfire selector;
18+ wcm = wrapWayfireApplication wcm selector;
2119 };
22−in
23−self
20+})
pkgs/development/libraries/wlroots/0.12.nixnew file+57
@@ -0,0 +1,57 @@
1+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
2+, libGL, wayland-protocols, libinput, libxkbcommon, pixman
3+, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
4+, libpng, ffmpeg
5+}:
6+
7+# Fixed version derivation.
8+# nixpkgs-update: no auto update
9+stdenv.mkDerivation rec {
10+ pname = "wlroots";
11+ version = "0.12.0";
12+
13+ src = fetchFromGitHub {
14+ owner = "swaywm";
15+ repo = "wlroots";
16+ rev = version;
17+ sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn";
18+ };
19+
20+ # $out for the library and $examples for the example programs (in examples):
21+ outputs = [ "out" "examples" ];
22+
23+ nativeBuildInputs = [ meson ninja pkg-config wayland ];
24+
25+ buildInputs = [
26+ libGL wayland wayland-protocols libinput libxkbcommon pixman
27+ xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
28+ libpng ffmpeg
29+ ];
30+
31+ mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ];
32+
33+ postFixup = ''
34+ # Install ALL example programs to $examples:
35+ # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
36+ # screenshot output-layout multi-pointer rotation tablet touch pointer
37+ # simple
38+ mkdir -p $examples/bin
39+ cd ./examples
40+ for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
41+ cp "$binary" "$examples/bin/wlroots-$binary"
42+ done
43+ '';
44+
45+ meta = with lib; {
46+ description = "A modular Wayland compositor library";
47+ longDescription = ''
48+ Pluggable, composable, unopinionated modules for building a Wayland
49+ compositor; or about 50,000 lines of code you were going to write anyway.
50+ '';
51+ inherit (src.meta) homepage;
52+ changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}";
53+ license = licenses.mit;
54+ platforms = platforms.linux;
55+ maintainers = with maintainers; [ primeos ];
56+ };
57+}
pkgs/top-level/all-packages.nix+26−9
@@ -22038,7 +22038,9 @@ in
2203822038
2203922039 caerbannog = callPackage ../applications/misc/caerbannog { };
2204022040
22041− cage = callPackage ../applications/window-managers/cage { };
22041+ cage = callPackage ../applications/window-managers/cage {
22042+ wlroots = wlroots_0_12;
22043+ };
2204222044
2204322045 calf = callPackage ../applications/audio/calf {
2204422046 inherit (gnome2) libglade;
@@ -23479,6 +23481,8 @@ in
2347923481
2348023482 wlroots = callPackage ../development/libraries/wlroots { };
2348123483
23484+ wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
23485+
2348223486 sway-unwrapped = callPackage ../applications/window-managers/sway { };
2348323487 sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
2348423488 swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
@@ -23499,7 +23503,9 @@ in
2349923503
2350023504 wbg = callPackage ../applications/misc/wbg { };
2350123505
23502− hikari = callPackage ../applications/window-managers/hikari { };
23506+ hikari = callPackage ../applications/window-managers/hikari {
23507+ wlroots = wlroots_0_12;
23508+ };
2350323509
2350423510 i3 = callPackage ../applications/window-managers/i3 {
2350523511 xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
@@ -23561,7 +23567,9 @@ in
2356123567
2356223568 i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
2356323569
23564− waybox = callPackage ../applications/window-managers/waybox { };
23570+ waybox = callPackage ../applications/window-managers/waybox {
23571+ wlroots = wlroots_0_12;
23572+ };
2356523573
2356623574 windowchef = callPackage ../applications/window-managers/windowchef/default.nix { };
2356723575
@@ -26432,10 +26440,15 @@ in
2643226440
2643326441 wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
2643426442 inherit (wayfireApplications) wayfire wcm;
26435− wayfireApplications-unwrapped = recurseIntoAttrs (callPackage ../applications/window-managers/wayfire/applications.nix { });
26436− wayfirePlugins = recurseIntoAttrs (callPackage ../applications/window-managers/wayfire/plugins.nix {
26437− inherit (wayfireApplications-unwrapped) wayfire;
26438− });
26443+ wayfireApplications-unwrapped = recurseIntoAttrs (
26444+ (callPackage ../applications/window-managers/wayfire/applications.nix { }).
26445+ extend (_: _: { wlroots = wlroots_0_12; })
26446+ );
26447+ wayfirePlugins = recurseIntoAttrs (
26448+ callPackage ../applications/window-managers/wayfire/plugins.nix {
26449+ inherit (wayfireApplications-unwrapped) wayfire;
26450+ }
26451+ );
2643926452 wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { };
2644026453
2644126454 waypipe = callPackage ../applications/networking/remote/waypipe { };
@@ -26477,7 +26490,9 @@ in
2647726490
2647826491 weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
2647926492
26480− wio = callPackage ../applications/window-managers/wio { };
26493+ wio = callPackage ../applications/window-managers/wio {
26494+ wlroots = wlroots_0_12;
26495+ };
2648126496
2648226497 whitebox-tools = callPackage ../applications/gis/whitebox-tools {
2648326498 inherit (darwin.apple_sdk.frameworks) Security;
@@ -30806,7 +30821,9 @@ in
3080630821
3080730822 bottom = callPackage ../tools/system/bottom {};
3080830823
30809− cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {};
30824+ cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {
30825+ wlroots = wlroots_0_12;
30826+ };
3081030827
3081130828 psftools = callPackage ../os-specific/linux/psftools {};
3081230829