amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: Add (guix build activation).

Browse source 
* gnu/services/dmd.scm (dmd-configuration-file): Remove 'etc'
  parameter.  Move /etc activation code to...
* guix/build/activation.scm: ... here; new file.
* gnu/system.scm (operating-system-boot-script): Augment script: add
  (guix build activation) to the load path; call 'activate-etc'.
* Makefile.am (MODULES): Add guix/build/activation.scm.
This commit is contained in:
Ludovic Courtès 2014-04-30 15:44:59 +02:00
parent 864068e204
commit 4dfe6c58ee
4 changed files with 84 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gnu/system.scm
View file

@ -256,10 +256,25 @@ we're running in the final root."
(mlet* %store-monad
((services (sequence %store-monad (operating-system-services os)))
(etc (operating-system-etc-directory os))
(dmd-conf (dmd-configuration-file services etc)))
(modules (imported-modules '((guix build activation))))
(compiled (compiled-modules '((guix build activation))))
(dmd-conf (dmd-configuration-file services)))
(gexp->file "boot"
#~(execl (string-append #$dmd "/bin/dmd")
"dmd" "--config" #$dmd-conf))))
#~(begin
(eval-when (expand load eval)
;; Make sure 'use-modules' below succeeds.
(set! %load-path (cons #$modules %load-path))
(set! %load-compiled-path
(cons #$compiled %load-compiled-path)))
(use-modules (guix build activation))
;; Populate /etc.
(activate-etc #$etc)
;; Start dmd.
(execl (string-append #$dmd "/bin/dmd")
"dmd" "--config" #$dmd-conf)))))
(define (operating-system-derivation os)
"Return a derivation that builds OS."