diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:40:51 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:40:51 +0100 |
| commit | f5e563e50a232492e57d609a95d96081a060ea17 (patch) | |
| tree | e329bce8fcbb72eac2ab8f0176227e2e2623d475 /guix/build-system | |
| parent | 1130929acfff30b3f179e6bb949b1b7d78b85b69 (diff) | |
| parent | 19464173bafdc42adfc8dd7277c491c40ddef66b (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/cargo.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 4a1eb0cfa0..7ff4e90f71 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2016 David Craven <david@craven.ch> +;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (%cargo-build-system-modules + %cargo-utils-modules cargo-build-system crate-url crate-url? @@ -49,10 +51,15 @@ to NAME and VERSION." (let ((rust (resolve-interface '(gnu packages rust)))) (module-ref rust 'rust))) +(define %cargo-utils-modules + ;; Build-side modules imported by default. + `((guix build cargo-utils) + ,@%gnu-build-system-modules)) + (define %cargo-build-system-modules ;; Build-side modules imported by default. `((guix build cargo-build-system) - ,@%gnu-build-system-modules)) + ,@%cargo-utils-modules)) (define* (cargo-build store name inputs #:key |