diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-13 22:52:25 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-13 22:52:25 +0200 |
| commit | 8ab70bae52f8d4b6356ec3b8a88cebf9debe8520 (patch) | |
| tree | 6e13e1de3c9addac9dad5d9f194c229baa3b59ab /guix/build-system | |
| parent | 9bc516bada71e1437d73971584bff5e72e053dbe (diff) | |
| parent | 8ea91d05b0fd16a8dd42a53efee9b16991d581b9 (diff) | |
Merge branch 'staging'
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/cargo.scm | 3 | ||||
| -rw-r--r-- | guix/build-system/go.scm | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 1e8b3a578e..6c8edf6bac 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> +;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,6 +77,7 @@ to NAME and VERSION." (vendor-dir "guix-vendor") (cargo-build-flags ''("--release")) (cargo-test-flags ''("--release")) + (features ''()) (skip-build? #f) (phases '(@ (guix build cargo-build-system) %standard-phases)) @@ -104,6 +106,7 @@ to NAME and VERSION." #:vendor-dir ,vendor-dir #:cargo-build-flags ,cargo-build-flags #:cargo-test-flags ,cargo-test-flags + #:features ,features #:skip-build? ,skip-build? #:tests? ,(and tests? (not skip-build?)) #:phases ,phases diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 1b916af8f9..f8ebaefb27 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> +;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,7 @@ (install-source? #t) (import-path "") (unpack-path "") + (build-flags ''()) (tests? #t) (allow-go-reference? #f) (system (%current-system)) @@ -109,6 +111,7 @@ #:install-source? ,install-source? #:import-path ,import-path #:unpack-path ,unpack-path + #:build-flags ,build-flags #:tests? ,tests? #:allow-go-reference? ,allow-go-reference? #:inputs %build-inputs))) |