wlroots: set default to 0.16

authored by

rewine and committed by
Anderson Torres
caf1c274 91e2ed97

+43 -27
+1 -4
pkgs/applications/window-managers/dwl/default.nix
··· 12 , wayland-scanner 13 , wayland 14 , wayland-protocols 15 - , wlroots_0_16 16 , writeText 17 , xcbutilwm 18 , xwayland ··· 20 , conf ? null 21 }: 22 23 - let 24 - wlroots = wlroots_0_16; 25 - in 26 stdenv.mkDerivation (finalAttrs: { 27 pname = "dwl"; 28 version = "0.4";
··· 12 , wayland-scanner 13 , wayland 14 , wayland-protocols 15 + , wlroots 16 , writeText 17 , xcbutilwm 18 , xwayland ··· 20 , conf ? null 21 }: 22 23 stdenv.mkDerivation (finalAttrs: { 24 pname = "dwl"; 25 version = "0.4";
+4 -6
pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
··· 57 "${hyprland.src}/nix/patches/wlroots-nvidia.patch" 58 ]); 59 60 - postPatch = 61 - (old.postPatch or "") 62 - + ( 63 - lib.optionalString enableNvidiaPatches 64 - ''substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"'' 65 - ); 66 67 buildInputs = old.buildInputs ++ [ 68 hwdata
··· 57 "${hyprland.src}/nix/patches/wlroots-nvidia.patch" 58 ]); 59 60 + # don't need old.postPatch for hwdata's path in wlroots 0.16 61 + postPatch = lib.optionalString enableNvidiaPatches '' 62 + substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();" 63 + ''; 64 65 buildInputs = old.buildInputs ++ [ 66 hwdata
+1 -4
pkgs/applications/window-managers/labwc/default.nix
··· 17 , wayland-scanner 18 , wayland 19 , wayland-protocols 20 - , wlroots_0_16 21 , xcbutilwm 22 , xwayland 23 }: 24 25 - let 26 - wlroots = wlroots_0_16; 27 - in 28 stdenv.mkDerivation (finalAttrs: { 29 pname = "labwc"; 30 version = "0.6.4";
··· 17 , wayland-scanner 18 , wayland 19 , wayland-protocols 20 + , wlroots 21 , xcbutilwm 22 , xwayland 23 }: 24 25 stdenv.mkDerivation (finalAttrs: { 26 pname = "labwc"; 27 version = "0.6.4";
+1 -1
pkgs/development/libraries/wlroots/default.nix
··· 124 ''; 125 }; 126 127 - wlroots = wlroots_0_15; 128 }
··· 124 ''; 125 }; 126 127 + wlroots = wlroots_0_16; 128 }
+30 -10
pkgs/top-level/all-packages.nix
··· 4785 4786 wlsunset = callPackage ../tools/wayland/wlsunset { }; 4787 4788 - wl-gammactl = callPackage ../tools/wayland/wl-gammactl { }; 4789 4790 wluma = callPackage ../tools/wayland/wluma { }; 4791 ··· 5405 5406 flashfocus = callPackage ../misc/flashfocus { }; 5407 5408 - qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; 5409 5410 fwup = callPackage ../tools/misc/fwup { 5411 inherit (darwin.apple_sdk.frameworks) DiskArbitration; ··· 5641 5642 hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; 5643 5644 - hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { }; 5645 5646 hysteria = callPackage ../tools/networking/hysteria { }; 5647 ··· 11920 11921 pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; 11922 11923 - phoc = callPackage ../applications/misc/phoc { }; 11924 11925 phockup = callPackage ../applications/misc/phockup { }; 11926 ··· 31377 31378 dyff = callPackage ../development/tools/dyff { }; 31379 31380 - dwl = callPackage ../applications/window-managers/dwl { }; 31381 31382 dwm = callPackage ../applications/window-managers/dwm { 31383 # dwm is configured entirely through source modification. Allow users to ··· 32802 32803 rootbar = callPackage ../applications/misc/rootbar { }; 32804 32805 - waybar = callPackage ../applications/misc/waybar { }; 32806 32807 waycorner = callPackage ../applications/misc/waycorner { }; 32808 ··· 32814 32815 wbg = callPackage ../applications/misc/wbg { }; 32816 32817 - hikari = callPackage ../applications/window-managers/hikari { }; 32818 32819 i3 = callPackage ../applications/window-managers/i3 { 32820 xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; ··· 32880 32881 kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { }; 32882 32883 - waybox = callPackage ../applications/window-managers/waybox { }; 32884 32885 workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; 32886 ··· 33427 33428 lame = callPackage ../development/libraries/lame { }; 33429 33430 - labwc = callPackage ../applications/window-managers/labwc { }; 33431 33432 larswm = callPackage ../applications/window-managers/larswm { }; 33433 ··· 34089 wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; 34090 mpv = wrapMpv mpv-unwrapped { }; 34091 34092 - mpvpaper = callPackage ../tools/wayland/mpvpaper { }; 34093 34094 mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; }; 34095
··· 4785 4786 wlsunset = callPackage ../tools/wayland/wlsunset { }; 4787 4788 + wl-gammactl = callPackage ../tools/wayland/wl-gammactl { 4789 + wlroots = wlroots_0_15; 4790 + }; 4791 4792 wluma = callPackage ../tools/wayland/wluma { }; 4793 ··· 5407 5408 flashfocus = callPackage ../misc/flashfocus { }; 5409 5410 + qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { 5411 + wlroots = wlroots_0_15; 5412 + }; 5413 5414 fwup = callPackage ../tools/misc/fwup { 5415 inherit (darwin.apple_sdk.frameworks) DiskArbitration; ··· 5645 5646 hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; 5647 5648 + hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { 5649 + wlroots = wlroots_0_15; 5650 + }; 5651 5652 hysteria = callPackage ../tools/networking/hysteria { }; 5653 ··· 11926 11927 pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; 11928 11929 + phoc = callPackage ../applications/misc/phoc { 11930 + wlroots = wlroots_0_15; 11931 + }; 11932 11933 phockup = callPackage ../applications/misc/phockup { }; 11934 ··· 31385 31386 dyff = callPackage ../development/tools/dyff { }; 31387 31388 + dwl = callPackage ../applications/window-managers/dwl { 31389 + wlroots = wlroots_0_16; 31390 + }; 31391 31392 dwm = callPackage ../applications/window-managers/dwm { 31393 # dwm is configured entirely through source modification. Allow users to ··· 32812 32813 rootbar = callPackage ../applications/misc/rootbar { }; 32814 32815 + waybar = callPackage ../applications/misc/waybar { 32816 + wlroots = wlroots_0_15; 32817 + }; 32818 32819 waycorner = callPackage ../applications/misc/waycorner { }; 32820 ··· 32826 32827 wbg = callPackage ../applications/misc/wbg { }; 32828 32829 + hikari = callPackage ../applications/window-managers/hikari { 32830 + wlroots = wlroots_0_15; 32831 + }; 32832 32833 i3 = callPackage ../applications/window-managers/i3 { 32834 xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; ··· 32894 32895 kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { }; 32896 32897 + waybox = callPackage ../applications/window-managers/waybox { 32898 + wlroots = wlroots_0_15; 32899 + }; 32900 32901 workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; 32902 ··· 33443 33444 lame = callPackage ../development/libraries/lame { }; 33445 33446 + labwc = callPackage ../applications/window-managers/labwc { 33447 + wlroots = wlroots_0_16; 33448 + }; 33449 33450 larswm = callPackage ../applications/window-managers/larswm { }; 33451 ··· 34107 wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; 34108 mpv = wrapMpv mpv-unwrapped { }; 34109 34110 + mpvpaper = callPackage ../tools/wayland/mpvpaper { 34111 + wlroots = wlroots_0_15; 34112 + }; 34113 34114 mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; }; 34115
+6 -2
pkgs/top-level/python-packages.nix
··· 10766 10767 pywizlight = callPackage ../development/python-modules/pywizlight { }; 10768 10769 - pywlroots = callPackage ../development/python-modules/pywlroots { }; 10770 10771 pyws66i = callPackage ../development/python-modules/pyws66i { }; 10772 ··· 10880 10881 qtconsole = callPackage ../development/python-modules/qtconsole { }; 10882 10883 - qtile = callPackage ../development/python-modules/qtile { }; 10884 qtile-extras = callPackage ../development/python-modules/qtile-extras { }; 10885 10886 qtpy = callPackage ../development/python-modules/qtpy { };
··· 10766 10767 pywizlight = callPackage ../development/python-modules/pywizlight { }; 10768 10769 + pywlroots = callPackage ../development/python-modules/pywlroots { 10770 + wlroots = pkgs.wlroots_0_15; 10771 + }; 10772 10773 pyws66i = callPackage ../development/python-modules/pyws66i { }; 10774 ··· 10882 10883 qtconsole = callPackage ../development/python-modules/qtconsole { }; 10884 10885 + qtile = callPackage ../development/python-modules/qtile { 10886 + wlroots = pkgs.wlroots_0_15; 10887 + }; 10888 qtile-extras = callPackage ../development/python-modules/qtile-extras { }; 10889 10890 qtpy = callPackage ../development/python-modules/qtpy { };