diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-02-18 21:53:59 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-02-18 21:53:59 +0100 |
| commit | 9fd72fb1ffbc3800c28f90a1b36e15d3fba974e1 (patch) | |
| tree | baf6897e3016f259596ed9f870fff5d622a01b84 | |
| parent | 9c8ba706d0b95684c27e407396e4b29790e0f27c (diff) | |
| download | patches-9fd72fb1ffbc3800c28f90a1b36e15d3fba974e1.tar patches-9fd72fb1ffbc3800c28f90a1b36e15d3fba974e1.tar.gz | |
store: Add the `%daemon-socket-file' parameter.
* guix/store.scm (%daemon-socket-file): New variable.
(open-connection): Use it as the default value for FILE.
| -rw-r--r-- | guix/store.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/guix/store.scm b/guix/store.scm index 6a3f036a8c..3627d5be04 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -31,7 +31,9 @@ #:use-module (ice-9 rdelim) #:use-module (ice-9 ftw) #:use-module (ice-9 regex) - #:export (nix-server? + #:export (%daemon-socket-file + + nix-server? nix-server-major-version nix-server-minor-version nix-server-socket @@ -143,6 +145,12 @@ (string-append (or (getenv "NIX_STATE_DIR") %state-directory) "/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 @@ -365,7 +373,7 @@ (message nix-protocol-error-message) (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)) "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 |