diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-12 16:50:47 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-12 17:46:23 +0000 |
| commit | a1eca979fb8da842e73c42f4f53be29b169810f2 (patch) | |
| tree | 681c7283e412bb8a29c2531c4408b49c3e184764 /guix/build-system | |
| parent | 48d86a9ec6d8d2e97da2299ea41a03ef4cdaab83 (diff) | |
| parent | 371aa5777a3805a3886f3feea5f1960fe3fe4219 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates-frozen.
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/linux-module.scm | 4 | ||||
| -rw-r--r-- | guix/build-system/renpy.scm | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index 7bafee5a7a..0eab919deb 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -158,6 +159,7 @@ (phases '%standard-phases) (outputs '("out")) (make-flags ''()) + (parallel-build? #t) (system (%current-system)) (source-directory ".") (guile #f) @@ -184,6 +186,7 @@ #:tests? #$tests? #:outputs #$(outputs->gexp outputs) #:make-flags #$make-flags + #:parallel-build? #$parallel-build? #:inputs #$(input-tuples->gexp inputs))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) @@ -201,6 +204,7 @@ (guile #f) (outputs '("out")) (make-flags ''()) + (parallel-build? #t) (search-paths '()) (native-search-paths '()) (tests? #f) diff --git a/guix/build-system/renpy.scm b/guix/build-system/renpy.scm index 0ee73ec969..f1070951ee 100644 --- a/guix/build-system/renpy.scm +++ b/guix/build-system/renpy.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; |