diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-11-14 18:11:58 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-11-14 21:34:08 +0100 |
| commit | 0fe1fba4af41f267c4bb2c006fb37f42422ab703 (patch) | |
| tree | 41e62d7998c5665b81664faa390507019698e468 /config-daemon.ac | |
| parent | 7a54b2281d1f60fd0ae2e058c219c5a600ad756b (diff) | |
| download | patches-0fe1fba4af41f267c4bb2c006fb37f42422ab703.tar patches-0fe1fba4af41f267c4bb2c006fb37f42422ab703.tar.gz | |
daemon: Install 'authenticate' script under LIBEXECDIR/guix.
That way it is handled in the same way as other helper scripts.
* nix/scripts/guix-authenticate.in: Rename to...
* nix/scripts/authenticate.in: ... this.
* config-daemon.ac: Adjust accordingly.
* nix/local.mk (libstore_a_CPPFLAGS): Remove -DOPENSSL_PATH.
(nodist_libexec_SCRIPTS): Remove.
(nodist_pkglibexec_SCRIPTS): New variable.
* nix/nix-daemon/guix-daemon.cc (main): Remove 'setenv' call for
"PATH".
* nix/libstore/local-store.cc (runAuthenticationProgram): New function.
(LocalStore::exportPath, LocalStore::importPath): Use it instead of
'runProgram' and OPENSSL_PATH.
Diffstat (limited to 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 04f0fde3b2..aac46817f5 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -163,8 +163,8 @@ if test "x$guix_build_daemon" = "xyes"; then [chmod +x nix/scripts/download]) AC_CONFIG_FILES([nix/scripts/substitute], [chmod +x nix/scripts/substitute]) - AC_CONFIG_FILES([nix/scripts/guix-authenticate], - [chmod +x nix/scripts/guix-authenticate]) + AC_CONFIG_FILES([nix/scripts/authenticate], + [chmod +x nix/scripts/authenticate]) AC_CONFIG_FILES([nix/scripts/offload], [chmod +x nix/scripts/offload]) fi |