From 6cdbf685f3a18f9d5d509b229285bc50ebde8dc3 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Tue, 9 Sep 2025 22:35:54 +0200 Subject: [PATCH] fix: ensure dwl unwrapped gets grafted inputs --- home/modules/ruther/home/dwl/wm.scm | 42 +++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/home/modules/ruther/home/dwl/wm.scm b/home/modules/ruther/home/dwl/wm.scm index a74862eecf658a3fb82c1ac1af234bf05204f5e8..d1ab64760323909b0adc3fa558ead979a00f1016 100644 --- a/home/modules/ruther/home/dwl/wm.scm +++ b/home/modules/ruther/home/dwl/wm.scm @@ -123,23 +123,43 @@ (commit "a8e46f319f574876ce697a7097eb47a2080b1a87"))) (sha256 (base32 "1jkyqwnc6x48bcjcyn1ha69vwql18ib1w47jx6bxz7wg7bvidm01")))) + (inputs + (modify-inputs (package-inputs base) + (append foot) + (append rofi-wayland) + (append swaylock) + (append mew) + (append dmenu-wl) + (append password-store-wl) + (append password-store-passmenus) + (append (emacs-for-wayland)))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases original-phases) #~(modify-phases #$original-phases (add-after 'unpack 'add-config - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (copy-file #$(local-file "config.h") "config.h") (substitute* "config.h" - (("\"foot\"") (string-append "\"" #$foot "/bin/foot\"")) - (("\"rofi\"") (string-append "\"" #$rofi-wayland "/bin/rofi\"")) - (("\"mew\"") (string-append "\"" #$mew "/bin/mew\"")) - (("\"mew-run\"") (string-append "\"" #$mew "/bin/mew-run\"")) - (("\"dmenu-wl\"") (string-append "\"" #$dmenu-wl "/bin/dmenu-wl\"")) - (("\"passmenu\"") (string-append "\"" #$password-store-wl "/bin/passmenu\"")) - (("\"passmenu-totp\"") (string-append "\"" #$password-store-passmenus "/bin/passmenu-totp\"")) - (("\"passmenu-multi\"") (string-append "\"" #$password-store-passmenus "/bin/passmenu-multi\"")) - (("\"emacsclient\"") (string-append "\"" #$(emacs-for-wayland) "/bin/emacsclient\"")) - (("\"swaylock\"") (string-append "\"" #$swaylock "/bin/swaylock\"")) + (("\"foot\"") + (string-append "\"" (search-input-file inputs "/bin/foot") "\"")) + (("\"rofi\"") + (string-append "\"" (search-input-file inputs "/bin/rofi") "\"")) + (("\"mew\"") + (string-append "\"" (search-input-file inputs "/bin/mew") "\"")) + (("\"mew-run\"") + (string-append "\"" (search-input-file inputs "/bin/mew-run") "\"")) + (("\"dmenu-wl\"") + (string-append "\"" (search-input-file inputs "/bin/dmenu-wl") "\"")) + (("\"passmenu\"") + (string-append "\"" (search-input-file inputs "/bin/passmenu") "\"")) + (("\"passmenu-totp\"") + (string-append "\"" (search-input-file inputs "/bin/passmenu-totp") "\"")) + (("\"passmenu-multi\"") + (string-append "\"" (search-input-file inputs "/bin/passmenu-multi") "\"")) + (("\"emacsclient") + (string-append "\"" (search-input-file inputs "/bin/emacsclient"))) + (("\"swaylock\"") + (string-append "\"" (search-input-file inputs "/bin/swaylock") "\"")) (("%brightness%") #$brightness-script) (("%printscreen%") #$printscreen-script)))))))))))