me/guix
Archived
1
0
Fork 0
Code Activity

services: nix: Add /bin/sh to build-sandbox-paths.

Browse source 
Fixes <https://bugs.gnu.org/46297>.

* gnu/services/nix.scm (nix-service-etc): Add /bin/sh to build-sandbox-paths.
This commit is contained in:
Oleg Pykhalov 2021-04-22 19:46:23 +03:00
parent 92e2249b1f
commit 43a7724040
No known key found for this signature in database
GPG key ID: 167F8EA5001AFA9C
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/services/nix.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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> ;;; Copyright © 2020 Peng Mei Yu <i@pengmeiyu.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -19,6 +19,7 @@
(define-module (gnu services nix) (define-module (gnu services nix)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages bash)
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (gnu services base) #:use-module (gnu services base)
#:use-module (gnu services configuration) #:use-module (gnu services configuration)
@ -121,7 +122,8 @@ GID."
(format #t "sandbox = ~a~%" (if #$sandbox "true" "false")) (format #t "sandbox = ~a~%" (if #$sandbox "true" "false"))
;; config.nix captures store file names. ;; config.nix captures store file names.
(format #t "build-sandbox-paths = ~{~a ~}~%" (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)) '#$build-sandbox-items))
(for-each (cut display <>) '#$extra-config))))))))))) (for-each (cut display <>) '#$extra-config)))))))))))