diff options
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 57d71e5158..2ac803986f 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages lsof) #:use-module (gnu packages gawk) #:use-module (gnu packages compression) + #:use-module (gnu packages firmware) #:autoload (gnu packages cryptsetup) (cryptsetup) #:use-module (gnu services) #:use-module (gnu services dmd) @@ -79,6 +80,7 @@ local-host-aliases %setuid-programs %base-packages + %base-firmware luks-device-mapping)) @@ -99,6 +101,8 @@ (initrd operating-system-initrd ; (list fs) -> M derivation (default base-initrd)) + (firmware operating-system-firmware ; list of packages + (default %base-firmware)) (host-name operating-system-host-name) ; string (hosts-file operating-system-hosts-file ; M item | #f @@ -159,6 +163,20 @@ file." (gexp->derivation name builder)) +(define (directory-union name things) + "Return a directory that is the union of THINGS." + (match things + ((one) + ;; Only one thing; return it. + (with-monad %store-monad (return one))) + (_ + (gexp->derivation name + #~(begin + (use-modules (guix build union)) + (union-build #$output '#$things)) + #:modules '((guix build union)) + #:local-build? #t)))) + ;;; ;;; Services. @@ -298,6 +316,10 @@ explicitly appear in OS." ;;; /etc. ;;; +(define %base-firmware + ;; Firmware usable by default. + (list ath9k-htc-firmware)) + (define %base-packages ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks. @@ -518,6 +540,8 @@ etc." (modules (imported-modules %modules)) (compiled (compiled-modules %modules)) (modprobe (modprobe-wrapper)) + (firmware (directory-union + "firmware" (operating-system-firmware os))) (accounts (operating-system-accounts os))) (define setuid-progs (operating-system-setuid-programs os)) @@ -563,6 +587,10 @@ etc." ;; Tell the kernel to use our 'modprobe' command. (activate-modprobe #$modprobe) + ;; Tell the kernel where firmware is. + (activate-firmware + (string-append #$firmware "/lib/firmware")) + ;; Run the services' activation snippets. ;; TODO: Use 'load-compiled'. (for-each primitive-load '#$actions) |