diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-01-31 23:11:37 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 23:11:37 -0300 |
| commit | f77378e87519b8f98ac4d5305dd768a86f17ae8a (patch) | |
| tree | 5cced0e629abcedb555cf5662e0b7ada7519fd24 /pkgs/applications/window-managers | |
| parent | 5776cd7640c41e0ef8b0fed36945d9734de786ff (diff) | |
| parent | 611555aeea9e262d61a1269ab0cc767932fe7ce8 (diff) | |
| download | nixpkgs-f77378e87519b8f98ac4d5305dd768a86f17ae8a.tar nixpkgs-f77378e87519b8f98ac4d5305dd768a86f17ae8a.tar.gz nixpkgs-f77378e87519b8f98ac4d5305dd768a86f17ae8a.tar.bz2 nixpkgs-f77378e87519b8f98ac4d5305dd768a86f17ae8a.tar.lz nixpkgs-f77378e87519b8f98ac4d5305dd768a86f17ae8a.tar.xz nixpkgs-f77378e87519b8f98ac4d5305dd768a86f17ae8a.tar.zst nixpkgs-f77378e87519b8f98ac4d5305dd768a86f17ae8a.zip | |
Merge pull request #157593 from AndersonTorres/new-misc
dwl: 0.2.1 -> 0.2.2
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/dwl/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 04944a1e909..bfc360e81bb 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 +, writeText , enable-xwayland ? true, xwayland, libX11 -, patches ? [ ] , conf ? null -, writeText -, fetchpatch +, 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 |