Commit caf1c274 authored by rewine's avatar rewine Committed by Anderson Torres
Browse files

wlroots: set default to 0.16

parent 91e2ed97
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@
, wayland-scanner
, wayland
, wayland-protocols
, wlroots_0_16
, wlroots
, writeText
, xcbutilwm
, xwayland
@@ -20,9 +20,6 @@
, conf ? null
}:

let
  wlroots = wlroots_0_16;
in
stdenv.mkDerivation (finalAttrs: {
  pname = "dwl";
  version = "0.4";
+4 −6
Original line number Diff line number Diff line
@@ -57,12 +57,10 @@ wlroots.overrideAttrs
        "${hyprland.src}/nix/patches/wlroots-nvidia.patch"
      ]);

    postPatch =
      (old.postPatch or "")
      + (
        lib.optionalString enableNvidiaPatches
          ''substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"''
      );
    # don't need old.postPatch for hwdata's path in wlroots 0.16
    postPatch = lib.optionalString enableNvidiaPatches ''
      substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
    '';

    buildInputs = old.buildInputs ++ [
      hwdata
+1 −4
Original line number Diff line number Diff line
@@ -17,14 +17,11 @@
, wayland-scanner
, wayland
, wayland-protocols
, wlroots_0_16
, wlroots
, xcbutilwm
, xwayland
}:

let
  wlroots = wlroots_0_16;
in
stdenv.mkDerivation (finalAttrs: {
  pname = "labwc";
  version = "0.6.4";
+1 −1
Original line number Diff line number Diff line
@@ -124,5 +124,5 @@ rec {
    '';
  };

  wlroots = wlroots_0_15;
  wlroots = wlroots_0_16;
}
+30 −10
Original line number Diff line number Diff line
@@ -4785,7 +4785,9 @@ with pkgs;
  wlsunset = callPackage ../tools/wayland/wlsunset { };
  wl-gammactl = callPackage ../tools/wayland/wl-gammactl { };
  wl-gammactl = callPackage ../tools/wayland/wl-gammactl {
    wlroots = wlroots_0_15;
  };
  wluma = callPackage ../tools/wayland/wluma {  };
@@ -5405,7 +5407,9 @@ with pkgs;
  flashfocus = callPackage ../misc/flashfocus { };
  qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { };
  qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr {
    wlroots = wlroots_0_15;
  };
  fwup = callPackage ../tools/misc/fwup {
    inherit (darwin.apple_sdk.frameworks) DiskArbitration;
@@ -5641,7 +5645,9 @@ with pkgs;
  hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
  hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { };
  hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker {
    wlroots = wlroots_0_15;
  };
  hysteria = callPackage ../tools/networking/hysteria { };
@@ -11920,7 +11926,9 @@ with pkgs;
  pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { };
  phoc = callPackage ../applications/misc/phoc { };
  phoc = callPackage ../applications/misc/phoc {
    wlroots = wlroots_0_15;
  };
  phockup = callPackage ../applications/misc/phockup { };
@@ -31377,7 +31385,9 @@ with pkgs;
  dyff = callPackage ../development/tools/dyff { };
  dwl = callPackage ../applications/window-managers/dwl { };
  dwl = callPackage ../applications/window-managers/dwl {
    wlroots = wlroots_0_16;
  };
  dwm = callPackage ../applications/window-managers/dwm {
    # dwm is configured entirely through source modification. Allow users to
@@ -32802,7 +32812,9 @@ with pkgs;
  rootbar = callPackage ../applications/misc/rootbar { };
  waybar = callPackage ../applications/misc/waybar { };
  waybar = callPackage ../applications/misc/waybar {
    wlroots = wlroots_0_15;
  };
  waycorner = callPackage ../applications/misc/waycorner { };
@@ -32814,7 +32826,9 @@ with pkgs;
  wbg = callPackage ../applications/misc/wbg { };
  hikari = callPackage ../applications/window-managers/hikari { };
  hikari = callPackage ../applications/window-managers/hikari {
    wlroots = wlroots_0_15;
  };
  i3 = callPackage ../applications/window-managers/i3 {
    xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
@@ -32880,7 +32894,9 @@ with pkgs;
  kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { };
  waybox = callPackage ../applications/window-managers/waybox { };
  waybox = callPackage ../applications/window-managers/waybox {
    wlroots = wlroots_0_15;
  };
  workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
@@ -33427,7 +33443,9 @@ with pkgs;
  lame = callPackage ../development/libraries/lame { };
  labwc = callPackage ../applications/window-managers/labwc { };
  labwc = callPackage ../applications/window-managers/labwc {
    wlroots = wlroots_0_16;
  };
  larswm = callPackage ../applications/window-managers/larswm { };
@@ -34089,7 +34107,9 @@ with pkgs;
  wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { };
  mpv = wrapMpv mpv-unwrapped { };
  mpvpaper = callPackage ../tools/wayland/mpvpaper { };
  mpvpaper = callPackage ../tools/wayland/mpvpaper {
    wlroots = wlroots_0_15;
  };
  mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; };
Loading