From 9ce78f27a02b3a5fcaea2f0633404b940795989a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Mar 2021 11:12:11 +0100 Subject: environment: Allow compilation with Guile 2.2. Fixes . Reported by cage . * guix/scripts/environment.scm (guix-environment): Move 'manifest' definition before expression. --- guix/scripts/environment.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index a39347743e..0360761683 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2018 David Thompson -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2018 Mike Gerwitz ;;; ;;; This file is part of GNU Guix. @@ -745,14 +745,15 @@ (define-command (guix-environment . args) (with-status-verbosity (assoc-ref opts 'verbosity) (define manifest-from-opts (options/resolve-packages store opts)) - (when (and profile - (> (length (manifest-entries manifest-from-opts)) 0)) - (leave (G_ "'--profile' cannot be used with package options~%"))) (define manifest (if profile - (profile-manifest profile) - manifest-from-opts)) + (profile-manifest profile) + manifest-from-opts)) + + (when (and profile + (> (length (manifest-entries manifest-from-opts)) 0)) + (leave (G_ "'--profile' cannot be used with package options~%"))) (set-build-options-from-command-line store opts) -- cgit v1.2.3