From e5f04c2dde258c14e714e748d17b1137fe0bf4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 12 Feb 2016 19:12:18 +0100 Subject: [PATCH] profiles: Add #:system argument to profile-derivation. Suggested by David Thompson . * guix/profiles.scm (profile-derivation): Add #:system parameter and honor it. --- guix/profiles.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index ce86ff8e0a..1c53c8047a 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2015 Mark H Weaver @@ -694,11 +694,15 @@ creates the GTK+ 'icon-theme.cache' file for each theme." (define* (profile-derivation manifest #:key - (hooks %default-profile-hooks)) + (hooks %default-profile-hooks) + system) "Return a derivation that builds a profile (aka. 'user environment') with the given MANIFEST. The profile includes additional derivations returned by the monadic procedures listed in HOOKS--such as an Info 'dir' file, etc." - (mlet %store-monad ((extras (if (null? (manifest-entries manifest)) + (mlet %store-monad ((system (if system + (return system) + (current-system))) + (extras (if (null? (manifest-entries manifest)) (return '()) (sequence %store-monad (map (lambda (hook)