diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 04944a1e9092..bfc360e81bbd 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,19 +1,18 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub -, pkg-config , libinput , libxcb , libxkbcommon , pixman +, pkg-config , wayland , wayland-protocols , wlroots -, enable-xwayland ? true, xwayland, libX11 -, patches ? [ ] -, conf ? null , writeText -, fetchpatch +, enable-xwayland ? true, xwayland, libX11 +, conf ? null +, patches ? [ ] }: let @@ -22,16 +21,17 @@ in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs="; + hash = "sha256-T2GqDehBNO8eublqZUmA5WADjnwElzT+bp9Dp1bqSgg="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libinput libxcb @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + NIX_CFLAGS_COMPILE = [ + # https://github.com/djpohly/dwl/issues/186 + "-Wno-error=unused-result" + ]; + dontConfigure = true; installPhase = '' @@ -85,8 +90,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + inherit (wayland.meta) platforms; }; } # TODO: custom patches from upstream website -# TODO: investigate the modifications in the upstream unstable version diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae9547e72ca4..515eafc016c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25231,9 +25231,7 @@ with pkgs; buildGoModule = buildGo117Module; }; - dwl = callPackage ../applications/window-managers/dwl { - wlroots = wlroots_0_14; - }; + dwl = callPackage ../applications/window-managers/dwl { }; dwm = callPackage ../applications/window-managers/dwm { # dwm is configured entirely through source modification. Allow users to