[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: services: nix: Add /bin/sh to build-sandbox-paths
From: |
guix-commits |
Subject: |
branch master updated: services: nix: Add /bin/sh to build-sandbox-paths. |
Date: |
Mon, 26 Apr 2021 13:04:42 -0400 |
This is an automated email from the git hooks/post-receive script.
wigust pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 43a7724 services: nix: Add /bin/sh to build-sandbox-paths.
43a7724 is described below
commit 43a7724040560d35e9e3a19bd1cfdb7e5c4c4711
Author: Oleg Pykhalov <go.wigust@gmail.com>
AuthorDate: Thu Apr 22 19:46:23 2021 +0300
services: nix: Add /bin/sh to build-sandbox-paths.
Fixes <https://bugs.gnu.org/46297>.
* gnu/services/nix.scm (nix-service-etc): Add /bin/sh to
build-sandbox-paths.
---
gnu/services/nix.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/services/nix.scm b/gnu/services/nix.scm
index 1aef47d..619e3ca 100644
--- a/gnu/services/nix.scm
+++ b/gnu/services/nix.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2019, 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Peng Mei Yu <i@pengmeiyu.com>
;;;
;;; This file is part of GNU Guix.
@@ -19,6 +19,7 @@
(define-module (gnu services nix)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages package-management)
#:use-module (gnu services base)
#:use-module (gnu services configuration)
@@ -121,7 +122,8 @@ GID."
(format #t "sandbox = ~a~%" (if #$sandbox "true" "false"))
;; config.nix captures store file names.
(format #t "build-sandbox-paths = ~{~a ~}~%"
- (append internal-sandbox-paths
+ (append (list (string-append "/bin/sh="
#$bash-minimal "/bin/sh"))
+ internal-sandbox-paths
'#$build-sandbox-items))
(for-each (cut display <>) '#$extra-config)))))))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: services: nix: Add /bin/sh to build-sandbox-paths.,
guix-commits <=