From e3e8c1bc749a0799c7c834680c897a10b2254484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 8 Apr 2014 18:16:44 +0200 Subject: [PATCH] hydra-eval-guile-jobs: Honor $NIX_STORE_DIR. * src/script/hydra-eval-guile-jobs.in (strip-store-path): Honor $NIX_STORE_DIR. --- src/script/hydra-eval-guile-jobs.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/script/hydra-eval-guile-jobs.in b/src/script/hydra-eval-guile-jobs.in index 2596f0ed..2deb3513 100644 --- a/src/script/hydra-eval-guile-jobs.in +++ b/src/script/hydra-eval-guile-jobs.in @@ -53,8 +53,10 @@ fails in our case, leading to the creation of empty (guix ...) modules." (struct-ref drv 3)) (define strip-store-path - (let ((store-path-rx - (make-regexp "^.*/nix/store/[^-]+-(.+)$"))) + (let* ((store (or (getenv "NIX_STORE_DIR") "/nix/store")) + (store-path-rx + (make-regexp (string-append "^.*" (regexp-quote store) + "/[^-]+-(.+)$")))) (lambda (path) (or (and=> (regexp-exec store-path-rx path) (lambda (match)