01/05: build-system/ocaml: Use standard packages as "build inputs".

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit a359f3a49cce26997ff85bcbfc0059450ff90e0f
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Mar 14 09:14:30 2022 +0100

    build-system/ocaml: Use standard packages as "build inputs".
    
    Conceptually, "standard packages" (GCC, Coreutils, etc.) are "build
    inputs".  In the absence of cross-compilation support, this change has
    no effect, except for things like '--tune' that expect the compiler to
    be among the build inputs.
    
    * guix/build-system/ocaml.scm (lower): Move (standard-packages) from
    'host-inputs' to 'build-inputs'.
---
 guix/build-system/ocaml.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm
index e7d6d96f0e..5ced9d243b 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
-;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -216,13 +216,13 @@ pre-defined variants."
          (host-inputs `(,@(if source
                               `(("source" ,source))
                               '())
-                        ,@inputs
-
-                        ;; Keep the standard inputs of 'gnu-build-system'.
-                        ,@(standard-packages)))
+                        ,@inputs))
          (build-inputs `(("ocaml" ,ocaml)
                          ("findlib" ,findlib)
-                         ,@native-inputs))
+                         ,@native-inputs
+
+                         ;; Keep the standard inputs of 'gnu-build-system'.
+                         ,@(standard-packages)))
          (outputs outputs)
          (build ocaml-build)
          (arguments (strip-keyword-arguments private-keywords arguments)))))