From 3f6f7b36d3bc919600cc35b5467c13634f9e4d53 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 24 Sep 2014 19:07:22 +0200 Subject: packages: Allow use of origins as patches. * guix/packages.scm (patch-and-repack)[patch-inputs]: Use 'add-to-store' only if the PATCH is a file name, and 'package-source-derivation' if PATCH is an origin. --- guix/packages.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'guix/packages.scm') diff --git a/guix/packages.scm b/guix/packages.scm index b4fc026dbb..97a2464309 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -345,8 +345,12 @@ (define (tarxz-name file-name) (define patch-inputs (map (lambda (number patch) (list (string-append "patch" (number->string number)) - (add-to-store store (basename patch) #t - "sha256" patch))) + (match patch + ((? string?) + (add-to-store store (basename patch) #t + "sha256" patch)) + ((? origin?) + (package-source-derivation store patch))))) (iota (length patches)) patches)) -- cgit v1.2.3