From 6eef66f4c82d7967943ad7e453eafe003bc71858 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 7 May 2021 19:56:24 +0200 Subject: [PATCH] dwl: 0.2 -> 0.2.1 The patches that were previously added in nixpkgs are included in the new version. --- .../window-managers/dwl/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 3442a4b7df9..04944a1e909 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -17,32 +17,18 @@ }: 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"; - }) - ]; + totalPatches = patches ++ [ ]; in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "gUaFTkpIQDswEubllMgvxPfCaEYFO7mODzjPyW7XsGQ="; + sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs="; }; nativeBuildInputs = [ pkg-config ];