git.iko.soy/typeable/nixpkgs
on master help sign in
wlroots: 0.12.0 -> 0.13.0

Pulls in an upstream patch for dwl. Explicitly takes xcbutilrenderutil as an argument to avoid pulling in all of xorg.

commite03dde82a74b65dbaeed590bd7970e3859de84af authorPatrick Hilhorst <git@hilhorst.be> dateThu 8 Apr 2021, 12:35 (6 years ago) parent49299ad
3 files changed+27−6
pkgs/applications/window-managers/dwl/default.nix+20−1 pkgs/development/libraries/wlroots/default.nix+4−4 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/window-managers/dwl/default.nix+20−1
@@ -12,8 +12,27 @@
1212, patches ? [ ]
1313, conf ? null
1414, writeText
15+, fetchpatch
1516}:
1617
18+let
19+ # Add two patches to fix compile errors with wlroots 0.13:
20+ totalPatches = patches ++ [
21+ # Fix the renamed constant WLR_KEY_PRESSED => WL_KEYBOARD_KEY_STATE_PRESSED
22+ # https://github.com/djpohly/dwl/pull/66
23+ (fetchpatch {
24+ url = "https://github.com/djpohly/dwl/commit/a42613db9d9f6debfa4fb2363d75af9457d238ed.patch";
25+ sha256 = "0h76hx1fhazi07gqg7sljh13f91v6bvjy7m9qqmimhvqgfwdcc0j";
26+ })
27+ # Use the new signature for wlr_backend_autocreate, which removes an argument:
28+ # https://github.com/djpohly/dwl/pull/76
29+ (fetchpatch {
30+ url = "https://github.com/djpohly/dwl/commit/0ff13cf216056a36a261f4eed53c6a864989a9fb.patch";
31+ sha256 = "18clpdb4il1vxf1b0cx0qrwild68s9dism8ab66zpmvxs5qag2dm";
32+ })
33+ ];
34+in
35+
1736stdenv.mkDerivation rec {
1837 pname = "dwl";
1938 version = "0.2";
@@ -39,7 +58,7 @@ stdenv.mkDerivation rec {
3958 ];
4059
4160 # Allow users to set their own list of patches
42− inherit patches;
61+ patches = totalPatches;
4362
4463 # Last line of config.mk enables XWayland
4564 prePatch = lib.optionalString enable-xwayland ''
pkgs/development/libraries/wlroots/default.nix+4−4
@@ -1,18 +1,18 @@
11{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
22, libGL, wayland-protocols, libinput, libxkbcommon, pixman
33, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
4−, libpng, ffmpeg
4+, libpng, ffmpeg, libuuid, xcbutilrenderutil, xwayland
55}:
66
77stdenv.mkDerivation rec {
88 pname = "wlroots";
9− version = "0.12.0";
9+ version = "0.13.0";
1010
1111 src = fetchFromGitHub {
1212 owner = "swaywm";
1313 repo = "wlroots";
1414 rev = version;
15− sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn";
15+ sha256 = "01plhbnsp5yg18arz0v8fr0pr9l4w4pdzwkg9px486qdvb3s1vgy";
1616 };
1717
1818 # $out for the library and $examples for the example programs (in examples):
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 buildInputs = [
2424 libGL wayland wayland-protocols libinput libxkbcommon pixman
2525 xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
26− libpng ffmpeg
26+ libpng ffmpeg libuuid xcbutilrenderutil xwayland
2727 ];
2828
2929 mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ];
pkgs/top-level/all-packages.nix+3−1
@@ -23479,7 +23479,9 @@ in
2347923479
2348023480 super-productivity = callPackage ../applications/networking/super-productivity { };
2348123481
23482− wlroots = callPackage ../development/libraries/wlroots { };
23482+ wlroots = callPackage ../development/libraries/wlroots {
23483+ inherit (xorg) xcbutilrenderutil;
23484+ };
2348323485
2348423486 wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
2348523487