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:
parent
49299adf4e
commit
e03dde82a7
|
@ -12,8 +12,27 @@
|
||||||
, patches ? [ ]
|
, patches ? [ ]
|
||||||
, conf ? null
|
, conf ? null
|
||||||
, writeText
|
, 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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dwl";
|
pname = "dwl";
|
||||||
version = "0.2";
|
version = "0.2";
|
||||||
|
@ -39,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
# Allow users to set their own list of patches
|
# Allow users to set their own list of patches
|
||||||
inherit patches;
|
patches = totalPatches;
|
||||||
|
|
||||||
# Last line of config.mk enables XWayland
|
# Last line of config.mk enables XWayland
|
||||||
prePatch = lib.optionalString enable-xwayland ''
|
prePatch = lib.optionalString enable-xwayland ''
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
|
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
|
||||||
, libGL, wayland-protocols, libinput, libxkbcommon, pixman
|
, libGL, wayland-protocols, libinput, libxkbcommon, pixman
|
||||||
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
|
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
|
||||||
, libpng, ffmpeg
|
, libpng, ffmpeg, libuuid, xcbutilrenderutil, xwayland
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wlroots";
|
pname = "wlroots";
|
||||||
version = "0.12.0";
|
version = "0.13.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "swaywm";
|
owner = "swaywm";
|
||||||
repo = "wlroots";
|
repo = "wlroots";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn";
|
sha256 = "01plhbnsp5yg18arz0v8fr0pr9l4w4pdzwkg9px486qdvb3s1vgy";
|
||||||
};
|
};
|
||||||
|
|
||||||
# $out for the library and $examples for the example programs (in examples):
|
# $out for the library and $examples for the example programs (in examples):
|
||||||
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libGL wayland wayland-protocols libinput libxkbcommon pixman
|
libGL wayland wayland-protocols libinput libxkbcommon pixman
|
||||||
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
|
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
|
||||||
libpng ffmpeg
|
libpng ffmpeg libuuid xcbutilrenderutil xwayland
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ];
|
mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ];
|
||||||
|
|
|
@ -23479,7 +23479,9 @@ in
|
||||||
|
|
||||||
super-productivity = callPackage ../applications/networking/super-productivity { };
|
super-productivity = callPackage ../applications/networking/super-productivity { };
|
||||||
|
|
||||||
wlroots = callPackage ../development/libraries/wlroots { };
|
wlroots = callPackage ../development/libraries/wlroots {
|
||||||
|
inherit (xorg) xcbutilrenderutil;
|
||||||
|
};
|
||||||
|
|
||||||
wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
|
wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue