Merge pull request #114358 from AndersonTorres/new-dwl

dwl: 0.1 -> 0.2
This commit is contained in:
Jörg Thalheim 2021-02-26 07:55:48 +00:00 committed by GitHub
commit 5963fa6c58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,6 +2,7 @@
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, libinput
, libxcb , libxcb
, libxkbcommon , libxkbcommon
, wayland , wayland
@ -15,27 +16,32 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dwl"; pname = "dwl";
version = "0.1"; version = "0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "djpohly"; owner = "djpohly";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "QoKaeF5DbSX0xciwc/0VKpubn/001cJjoZ+UzVDX4qE="; sha256 = "gUaFTkpIQDswEubllMgvxPfCaEYFO7mODzjPyW7XsGQ=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
libinput
libxcb libxcb
libxkbcommon libxkbcommon
wayland wayland
wayland-protocols wayland-protocols
wlroots wlroots
] ++ lib.optionals enable-xwayland [ xwayland libX11 ]; ] ++ lib.optionals enable-xwayland [
libX11
xwayland
];
# Allow users to set their own list of patches # Allow users to set their own list of patches
inherit patches; inherit patches;
# Last line of config.mk enables XWayland
prePatch = lib.optionalString enable-xwayland '' prePatch = lib.optionalString enable-xwayland ''
sed -i -e '$ s|^#||' config.mk sed -i -e '$ s|^#||' config.mk
''; '';