aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludovic.courtes@inria.fr>2017-06-15 18:07:10 +0200
committerLudovic Courtès <ludo@gnu.org>2017-06-15 23:07:47 +0200
commit7ebc6cf869006a2a568b09cc6b435961f399a20a (patch)
treefba226599d8ec54b3d9b08af989be0b98004f696
parent02084762605e1fd8bc70376e4297871db6d84a82 (diff)
downloadguix-7ebc6cf869006a2a568b09cc6b435961f399a20a.tar
guix-7ebc6cf869006a2a568b09cc6b435961f399a20a.tar.gz
packages: Patches can be any lowerable object.
* guix/packages.scm (patch-and-repack)[instantiate-patch]: Replace 'origin?' with 'struct?'.
-rw-r--r--guix/packages.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/packages.scm b/guix/packages.scm
index f4967f98fa..76aa43e7d3 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -477,10 +477,10 @@ specifies modules in scope when evaluating SNIPPET."
(define instantiate-patch
(match-lambda
- ((? string? patch)
+ ((? string? patch) ;deprecated
(interned-file patch #:recursive? #t))
- ((? origin? patch)
- (origin->derivation patch system))))
+ ((? struct? patch) ;origin, local-file, etc.
+ (lower-object patch system))))
(mlet %store-monad ((tar -> (lookup-input "tar"))
(xz -> (lookup-input "xz"))