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>

+96 -25
+13 -16
pkgs/applications/window-managers/wayfire/applications.nix
··· 1 - { newScope, wayfirePlugins }: 1 + { lib, newScope, wayfirePlugins }: 2 2 3 - let 4 - self = with self; { 5 - inherit wayfirePlugins; 3 + lib.makeExtensible (self: with self; { 4 + inherit wayfirePlugins; 6 5 7 - callPackage = newScope self; 6 + callPackage = newScope self; 8 7 9 - wayfire = callPackage ./. { }; 8 + wayfire = callPackage ./. { }; 10 9 11 - wcm = callPackage ./wcm.nix { 12 - inherit (wayfirePlugins) wf-shell; 13 - }; 10 + wcm = callPackage ./wcm.nix { 11 + inherit (wayfirePlugins) wf-shell; 12 + }; 14 13 15 - wrapWayfireApplication = callPackage ./wrapper.nix { }; 14 + wrapWayfireApplication = callPackage ./wrapper.nix { }; 16 15 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; 21 19 }; 22 - in 23 - self 20 + })
+57
pkgs/development/libraries/wlroots/0.12.nix
··· 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 + }
+26 -9
pkgs/top-level/all-packages.nix
··· 22038 22038 22039 22039 caerbannog = callPackage ../applications/misc/caerbannog { }; 22040 22040 22041 - cage = callPackage ../applications/window-managers/cage { }; 22041 + cage = callPackage ../applications/window-managers/cage { 22042 + wlroots = wlroots_0_12; 22043 + }; 22042 22044 22043 22045 calf = callPackage ../applications/audio/calf { 22044 22046 inherit (gnome2) libglade; ··· 23479 23481 23480 23482 wlroots = callPackage ../development/libraries/wlroots { }; 23481 23483 23484 + wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {}; 23485 + 23482 23486 sway-unwrapped = callPackage ../applications/window-managers/sway { }; 23483 23487 sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; 23484 23488 swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; ··· 23499 23503 23500 23504 wbg = callPackage ../applications/misc/wbg { }; 23501 23505 23502 - hikari = callPackage ../applications/window-managers/hikari { }; 23506 + hikari = callPackage ../applications/window-managers/hikari { 23507 + wlroots = wlroots_0_12; 23508 + }; 23503 23509 23504 23510 i3 = callPackage ../applications/window-managers/i3 { 23505 23511 xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; ··· 23561 23567 23562 23568 i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; 23563 23569 23564 - waybox = callPackage ../applications/window-managers/waybox { }; 23570 + waybox = callPackage ../applications/window-managers/waybox { 23571 + wlroots = wlroots_0_12; 23572 + }; 23565 23573 23566 23574 windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; 23567 23575 ··· 26432 26440 26433 26441 wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); 26434 26442 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 + ); 26439 26452 wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; 26440 26453 26441 26454 waypipe = callPackage ../applications/networking/remote/waypipe { }; ··· 26477 26490 26478 26491 weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; 26479 26492 26480 - wio = callPackage ../applications/window-managers/wio { }; 26493 + wio = callPackage ../applications/window-managers/wio { 26494 + wlroots = wlroots_0_12; 26495 + }; 26481 26496 26482 26497 whitebox-tools = callPackage ../applications/gis/whitebox-tools { 26483 26498 inherit (darwin.apple_sdk.frameworks) Security; ··· 30806 30821 30807 30822 bottom = callPackage ../tools/system/bottom {}; 30808 30823 30809 - cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {}; 30824 + cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { 30825 + wlroots = wlroots_0_12; 30826 + }; 30810 30827 30811 30828 psftools = callPackage ../os-specific/linux/psftools {}; 30812 30829