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.
This commit is contained in:
@@ -12,8 +12,27 @@
|
||||
, patches ? [ ]
|
||||
, conf ? null
|
||||
, writeText
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
# Add two patches to fix compile errors with wlroots 0.13:
|
||||
totalPatches = patches ++ [
|
||||
# Fix the renamed constant WLR_KEY_PRESSED => WL_KEYBOARD_KEY_STATE_PRESSED
|
||||
# https://github.com/djpohly/dwl/pull/66
|
||||
(fetchpatch {
|
||||
url = "https://github.com/djpohly/dwl/commit/a42613db9d9f6debfa4fb2363d75af9457d238ed.patch";
|
||||
sha256 = "0h76hx1fhazi07gqg7sljh13f91v6bvjy7m9qqmimhvqgfwdcc0j";
|
||||
})
|
||||
# Use the new signature for wlr_backend_autocreate, which removes an argument:
|
||||
# https://github.com/djpohly/dwl/pull/76
|
||||
(fetchpatch {
|
||||
url = "https://github.com/djpohly/dwl/commit/0ff13cf216056a36a261f4eed53c6a864989a9fb.patch";
|
||||
sha256 = "18clpdb4il1vxf1b0cx0qrwild68s9dism8ab66zpmvxs5qag2dm";
|
||||
})
|
||||
];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dwl";
|
||||
version = "0.2";
|
||||
@@ -39,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# Allow users to set their own list of patches
|
||||
inherit patches;
|
||||
patches = totalPatches;
|
||||
|
||||
# Last line of config.mk enables XWayland
|
||||
prePatch = lib.optionalString enable-xwayland ''
|
||||
|
||||
Reference in New Issue
Block a user