From 0c684b7edfacada4f576855dbb09291f04a84fa2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 3 Sep 2019 21:51:25 +0200 Subject: daemon: Run 'guix authenticate' directly. * nix/scripts/authenticate.in: Remove. * nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove scripts/authenticate. * config-daemon.ac: Don't output 'nix/scripts/authenticate'. * nix/libstore/local-store.cc (runAuthenticationProgram): Run 'guix authenticate'. --- nix/libstore/local-store.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'nix/libstore') diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index 892d9300b1..951c35faf3 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -1224,8 +1224,9 @@ static void checkSecrecy(const Path & path) static std::string runAuthenticationProgram(const Strings & args) { - return runProgram(settings.nixLibexecDir + "/authenticate", - false, args); + Strings fullArgs = { "authenticate" }; + fullArgs.insert(fullArgs.end(), args.begin(), args.end()); // append + return runProgram(settings.guixProgram, false, fullArgs); } void LocalStore::exportPath(const Path & path, bool sign, -- cgit v1.2.3