01/02: gnu: opam: Fix package installation.

[guix-commits]

roptat pushed a commit to branch master
in repository guix.

commit 2a6ba9ff6102f865761530687866f12397f06c36
Author: Julien Lepiller <address@hidden>
Date:   Mon Dec 17 21:17:54 2018 +0100

    gnu: opam: Fix package installation.
    
    Opam builds packages in an isolated environment, but packages still
    assume they can access system tools like a compiler, make, etc... Mount
    /gnu and /run/current-system so these tools are also available to opam
    packages on GuixSD.
    
    * gnu/packages/ocaml.scm (opam)[arguments]: Fix bwrap.sh to also mount
    the store and the system profile in the opam environment.
---
 gnu/packages/ocaml.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e4a76ac..7ba5a6b 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -384,7 +384,13 @@ functional, imperative and object-oriented styles of 
programming.")
                        ;; Use bwrap from the store directly.
                        (substitute* "src/state/shellscripts/bwrap.sh"
                          (("-v bwrap") (string-append "-v " bwrap))
-                         (("exec bwrap") (string-append "exec " bwrap)))
+                         (("exec bwrap") (string-append "exec " bwrap))
+                         ;; Mount /gnu and /run/current-system in the
+                         ;; isolated environment when building with opam.
+                         ;; This is necessary for packages to find external
+                         ;; dependencies, such as a C compiler, make, etc...
+                         (("^add_mounts ro /usr")
+                          "add_mounts ro /gnu /run/current-system /usr"))
                        (substitute* "src/client/opamInitDefaults.ml"
                          (("\"bwrap\"") (string-append "\"" bwrap "\"")))
                        ;; Build dependencies