Merge staging-next-21.05 into staging-21.05

2021-08-06 18:02:40 +00:00
parent 762123e6a0 b538b863a6
commit 4bd56dee3e
21 changed files with 118 additions and 100 deletions
@@ -23129,7 +23129,11 @@ in

  dwl = callPackage ../applications/window-managers/dwl { };

-  dwm = callPackage ../applications/window-managers/dwm { };
+  dwm = callPackage ../applications/window-managers/dwm {
+    # dwm is configured entirely through source modification. Allow users to
+    # specify patches through nixpkgs.config.dwm.patches
+    patches = config.dwm.patches or [];
+  };

  dwmblocks = callPackage ../applications/misc/dwmblocks { };