diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-06-18 02:36:51 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-06-18 02:36:51 -0400 |
| commit | 9d4385634d098cc0fb35bfe58179f7d855352e39 (patch) | |
| tree | 653cfd7a6faecaf42129b1aa47703e7bd01bc471 /guix/packages.scm | |
| parent | a6aff3528c32cc921bddd78b254678a1fc121f21 (diff) | |
| parent | 96fd87c96bd6987a967575aaa931c5a7b1c84e21 (diff) | |
| download | gnu-guix-9d4385634d098cc0fb35bfe58179f7d855352e39.tar gnu-guix-9d4385634d098cc0fb35bfe58179f7d855352e39.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/packages.scm')
| -rw-r--r-- | guix/packages.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index 97580352e2..cea3a7472f 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")) |