diff options
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/cmake.scm | 5 | ||||
| -rw-r--r-- | guix/build-system/gnu.scm | 30 |
2 files changed, 19 insertions, 16 deletions
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 29259c5785..f590b6ea42 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,6 +114,7 @@ (phases '(@ (guix build cmake-build-system) %standard-phases)) (system (%current-system)) + (substitutable? #t) (imported-modules %cmake-build-system-modules) (modules '((guix build cmake-build-system) (guix build utils)))) @@ -162,6 +164,7 @@ provides a 'CMakeLists.txt' file as its build system." #:inputs inputs #:modules imported-modules #:outputs outputs + #:substitutable? substitutable? #:guile-for-build guile-for-build)) @@ -192,6 +195,7 @@ provides a 'CMakeLists.txt' file as its build system." "bin" "sbin")) (phases '(@ (guix build cmake-build-system) %standard-phases)) + (substitutable? #t) (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %cmake-build-system-modules) @@ -271,6 +275,7 @@ build system." #:inputs (append native-drvs target-drvs) #:outputs outputs #:modules imported-modules + #:substitutable? substitutable? #:guile-for-build guile-for-build)) (define cmake-build-system diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index f59567febb..6b481ad45c 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -235,25 +235,21 @@ exact build phases are defined by PHASES." (source s) (arguments ;; Use the right phases and modules. - (let* ((args (default-keyword-arguments (package-arguments p) - `(#:phases #f - #:modules ,%default-modules - #:imported-modules ,%gnu-build-system-modules)))) - (substitute-keyword-arguments args - ((#:modules modules) - `((guix build gnu-dist) - ,@modules)) - ((#:imported-modules modules) - `((guix build gnu-dist) - ,@modules)) - ((#:phases _) - phases)))) + (substitute-keyword-arguments (package-arguments p) + ((#:modules modules %default-modules) + `((guix build gnu-dist) + ,@modules)) + ((#:imported-modules modules %gnu-build-system-modules) + `((guix build gnu-dist) + ,@modules)) + ((#:phases _ #f) + phases))) (native-inputs ;; Add autotools & co. as inputs. (let ((ref (lambda (module var) (module-ref (resolve-interface module) var)))) `(,@(package-native-inputs p) - ("autoconf" ,((ref '(gnu packages autotools) 'autoconf-wrapper))) + ("autoconf" ,(ref '(gnu packages autotools) 'autoconf-wrapper)) ("automake" ,(ref '(gnu packages autotools) 'automake)) ("libtool" ,(ref '(gnu packages autotools) 'libtool)) ("gettext" ,(ref '(gnu packages gettext) 'gnu-gettext)) @@ -517,9 +513,11 @@ platform." (define canonicalize-reference (match-lambda ((? package? p) - (derivation->output-path (package-cross-derivation store p system))) + (derivation->output-path (package-cross-derivation store p + target system))) (((? package? p) output) - (derivation->output-path (package-cross-derivation store p system) + (derivation->output-path (package-cross-derivation store p + target system) output)) ((? string? output) output))) |