From 93a0a8b3fdced4afe3ac2fb0783944c5d76cb360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 16 Aug 2012 19:00:49 +0200 Subject: [PATCH] packages: Add all non-derivation paths to the store. * guix/packages.scm (package-derivation): Add all non-derivation paths to the store. --- guix/packages.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 311e3b6048..3ae71c99db 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -200,13 +200,13 @@ with their propagated inputs, recursively." (list name (package-derivation store package) sub-drv)) (((? string? name) - (and (? string?) (? store-path?) drv)) - ;; Both derivation and output paths. The latter - ;; can be files already in the store. + (and (? string?) (? derivation-path?) drv)) (list name drv)) (((? string? name) - (and (? string?) (? (negate store-path?)) - (? file-exists? file))) + (and (? string?) (? file-exists? file))) + ;; Add FILE to the store. When FILE is in the + ;; sub-directory of a store path, it needs to be + ;; added anyway, so it can be used as a source. (list name (add-to-store store (basename file) #t #f "sha256" file))))