me/guix
Archived
1
0
Fork 0
Code Activity

store: Add the `%daemon-socket-file' parameter.

Browse source 
* guix/store.scm (%daemon-socket-file): New variable.
  (open-connection): Use it as the default value for FILE.
This commit is contained in:
Ludovic Courtès 2013-02-18 21:53:59 +01:00
parent a1143ee3fa
commit 05c0ac721e
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
guix/store.scm
View file

@ -31,7 +31,9 @@
#:use-module (ice-9 rdelim) #:use-module (ice-9 rdelim)
#:use-module (ice-9 ftw) #:use-module (ice-9 ftw)
#:use-module (ice-9 regex) #:use-module (ice-9 regex)
#:export (nix-server? #:export (%daemon-socket-file
nix-server?
nix-server-major-version nix-server-major-version
nix-server-minor-version nix-server-minor-version
nix-server-socket nix-server-socket
@ -143,6 +145,12 @@
(string-append (or (getenv "NIX_STATE_DIR") %state-directory) (string-append (or (getenv "NIX_STATE_DIR") %state-directory)
"/daemon-socket/socket")) "/daemon-socket/socket"))
(define %daemon-socket-file
;; File name of the socket the daemon listens too.
(make-parameter (or (getenv "GUIX_DAEMON_SOCKET")
%default-socket-path)))
;; serialize.cc ;; serialize.cc
@ -365,7 +373,7 @@
(message nix-protocol-error-message) (message nix-protocol-error-message)
(status nix-protocol-error-status)) (status nix-protocol-error-status))
(define* (open-connection #:optional (file %default-socket-path) (define* (open-connection #:optional (file (%daemon-socket-file))
#:key (reserve-space? #t)) #:key (reserve-space? #t))
"Connect to the daemon over the Unix-domain socket at FILE. When "Connect to the daemon over the Unix-domain socket at FILE. When
RESERVE-SPACE? is true, instruct it to reserve a little bit of extra RESERVE-SPACE? is true, instruct it to reserve a little bit of extra