From 53f974fd45ae9fb8401fd541adf25bcfae3c36af Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 13 Dec 2012 22:53:05 +0100 Subject: guix-package: Use directory names from (guix config). * guix-package.in (%profile-directory): Use %STATE-DIRECTORY instead of a hard-coded directory. --- guix-package.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix-package.in b/guix-package.in index ff7f38383e..dbd2ee24c7 100644 --- a/guix-package.in +++ b/guix-package.in @@ -35,6 +35,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \ #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix config) #:use-module (ice-9 ftw) #:use-module (ice-9 format) #:use-module (ice-9 match) @@ -61,8 +62,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \ (cut string-append <> "/.guix-profile"))) (define %profile-directory - (string-append "/nix/var/nix/profiles/" - "guix/" + (string-append %state-directory "/profiles/" (or (and=> (getenv "USER") (cut string-append "per-user/" <>)) "default"))) -- cgit v1.2.3