From 611adb1ee5814907694abc9afa1bad984f0cbea0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 May 2015 14:14:58 +0200 Subject: 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. --- guix/profiles.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'guix/profiles.scm') 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) -- cgit v1.2.3