nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More /gnu/store replacements. 

* gnu/packages/gcc.scm (gcc-4.7): Change /nix/store in comment.
* gnu/system/vm.scm (operating-system-default-contents):
  Use (%store-prefix) instead of "/nix/store".
* guix/derivations.scm (derivation-path->output-path,
  derivation-path->output-paths): Change to /gnu/store in docstring.
This commit is contained in:
Ludovic Courtès 2014-03-10 23:58:40 +01:00
parent c9c88118a1
commit 6f58d58243
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/gcc.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -186,7 +186,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
'configure 'post-configure 'configure 'post-configure
(lambda _ (lambda _
;; Don't store configure flags, to avoid retaining references to ;; Don't store configure flags, to avoid retaining references to
;; build-time dependencies---e.g., `--with-ppl=/nix/store/xxx'. ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
(substitute* "Makefile" (substitute* "Makefile"
(("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest) (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
"TOPLEVEL_CONFIGURE_ARGUMENTS=\n"))) "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))

4
gnu/system/vm.scm
View File

@ -373,7 +373,7 @@ such as /etc files."
;; (not 'futime'), so the timestamp of ;; (not 'futime'), so the timestamp of
;; symlinks cannot be changed, and there ;; symlinks cannot be changed, and there
;; are symlinks here pointing to ;; are symlinks here pointing to
;; /nix/store, which is the host, ;; /gnu/store, which is the host,
;; read-only store. ;; read-only store.
(unless (eq? (stat:type s) 'symlink) (unless (eq? (stat:type s) 'symlink)
(utime file 0 0 0 0)))) (utime file 0 0 0 0))))
@ -448,7 +448,7 @@ basic contents of the root file system of OS."
(os-dir -> (derivation->output-path os-drv)) (os-dir -> (derivation->output-path os-drv))
(build-gid (operating-system-build-gid os)) (build-gid (operating-system-build-gid os))
(profile (operating-system-profile-directory os))) (profile (operating-system-profile-directory os)))
(return `((directory "/nix/store" 0 ,(or build-gid 0)) (return `((directory ,(%store-prefix) 0 ,(or build-gid 0))
(directory "/etc") (directory "/etc")
(directory "/var/log") ; for dmd (directory "/var/log") ; for dmd
(directory "/var/run/nscd") (directory "/var/run/nscd")

4
guix/derivations.scm
View File

@ -451,13 +451,13 @@ that form."
;; This procedure is called frequently, so memoize it. ;; This procedure is called frequently, so memoize it.
(memoize (memoize
(lambda* (path #:optional (output "out")) (lambda* (path #:optional (output "out"))
"Read the derivation from PATH (`/nix/store/xxx.drv'), and return the store "Read the derivation from PATH (`/gnu/store/xxx.drv'), and return the store
path of its output OUTPUT." path of its output OUTPUT."
(derivation->output-path (call-with-input-file path read-derivation) (derivation->output-path (call-with-input-file path read-derivation)
output)))) output))))
(define (derivation-path->output-paths path) (define (derivation-path->output-paths path)
"Read the derivation from PATH (`/nix/store/xxx.drv'), and return the "Read the derivation from PATH (`/gnu/store/xxx.drv'), and return the
list of name/path pairs of its outputs." list of name/path pairs of its outputs."
(derivation->output-paths (call-with-input-file path read-derivation))) (derivation->output-paths (call-with-input-file path read-derivation)))