diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-06 14:14:58 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-06 18:26:54 +0200 |
| commit | 611adb1ee5814907694abc9afa1bad984f0cbea0 (patch) | |
| tree | 420b455b36d28e7df4a6c2b2bb2bcfd6fdd4a02f /guix/profiles.scm | |
| parent | d838e7029854d8517c0c5b631f6042a925c86a81 (diff) | |
| download | gnu-guix-611adb1ee5814907694abc9afa1bad984f0cbea0.tar gnu-guix-611adb1ee5814907694abc9afa1bad984f0cbea0.tar.gz | |
profiles: Move build code to (guix build profiles).
* guix/build/profiles.scm: New file.
* Makefile.am (MODULES): Add it.
* guix/profiles.scm (profile-derivation)[builder]: Call out to
'build-profile'.
Add (guix build profiles) to the #:modules argument.
Diffstat (limited to 'guix/profiles.scm')
| -rw-r--r-- | guix/profiles.scm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm index 8445e00761..afc22e118d 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -598,20 +598,17 @@ the monadic procedures listed in HOOKS--such as an Info 'dir' file, etc." (define builder #~(begin - (use-modules (ice-9 pretty-print) - (guix build union)) + (use-modules (guix build profiles)) (setvbuf (current-output-port) _IOLBF) (setvbuf (current-error-port) _IOLBF) - (union-build #$output '#$inputs - #:log-port (%make-void-port "w")) - (call-with-output-file (string-append #$output "/manifest") - (lambda (p) - (pretty-print '#$(manifest->gexp manifest) p))))) + (build-profile #$output '#$inputs + #:manifest '#$(manifest->gexp manifest)))) (gexp->derivation "profile" builder - #:modules '((guix build union)) + #:modules '((guix build union) + (guix build profiles)) #:local-build? #t))) (define (profile-regexp profile) |