iiogama/confix
iiogama/confix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed config.h patch from dwl for initial testing.

Browse Source
This commit is contained in:
Thai Noodles 2024-01-06 09:21:03 -08:00
parent d36ca7fab1
commit 0306aa6381
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dwl-build_error.log Normal file
View File

@ -0,0 +1,15 @@
error: builder for '/nix/store/kdnn9827xdjh7zwfcahajjzh8qpqlrn4-dwl-0.4.drv' failed with exit code 2;
last 10 log lines:
> dwl.c:407:44: error: 'tags' undeclared here (not in a function); did you mean 'tag'?
> 407 | struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
> | ^~~~
> dwl.c:68:41: note: in definition of macro 'LENGTH'
> 68 | #define LENGTH(X) (sizeof X / sizeof X[0])
> | ^
> config.h:21:12: warning: 'log_level' defined but not used [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wunused-variable-Wunused-variable8;;]
> 21 | static int log_level = WLR_ERROR;
> | ^~~~~~~~~
> make: *** [Makefile:60: dwl.o] Error 1
For full logs, run 'nix log /nix/store/kdnn9827xdjh7zwfcahajjzh8qpqlrn4-dwl-0.4.drv'.
error: 1 dependencies of derivation '/nix/store/lk9g5kw1yh15p2p5iw4a0wps6jq560in-system-path.drv' failed to build
error: 1 dependencies of derivation '/nix/store/id6523vap8cxfd7ds9yi9h49b08avwxf-nixos-system-buckwheat-24.05.20231219.54aac08.drv' failed to build

9
nixos/gui.nix
View File

@ -99,11 +99,12 @@
xsel
# Packages for Wayland
(dwl.overrideAttrs (oldAttrs: rec {
configFile = writeText "config.def.h" (builtins.readFile ./patches/dwl/config.h);
postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
}))
#(dwl.overrideAttrs (oldAttrs: rec {
# configFile = writeText "config.def.h" (builtins.readFile ./patches/dwl/config.h);
# postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
#}))
bemenu
dwl
foot
];
}

4
nixos/patches/dwl/config.h
View File

@ -123,14 +123,14 @@ static const Key keys[] = {
/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
/* modifier key function argument */
{ MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} },
{ MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} },
{ MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
{ MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
{ MODKEY, XKB_KEY_i, incnmaster, {.i = +1} },
{ MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
{ MODKEY, XKB_KEY_h, setmfact, {.f = -0.05} },
{ MODKEY, XKB_KEY_l, setmfact, {.f = +0.05} },
{ MODKEY, XKB_KEY_Return, zoom, {0} },
{ MODKEY|WLR_MODIFER_SHIFT, XKB_KEY_Return, zoom, {0} },
{ MODKEY, XKB_KEY_Tab, view, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },