diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2020-01-21 10:35:59 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2020-01-21 22:57:23 +0100 |
| commit | 0dd1e277b125b469ee1cd10eb1f32a3423dfaab2 (patch) | |
| tree | 638338e6e8aa74122204af9bc3bed7d991cfa273 | |
| parent | 79e074ea10875ff75ca613179c70de12d64b19f5 (diff) | |
| download | guix-0dd1e277b125b469ee1cd10eb1f32a3423dfaab2.tar guix-0dd1e277b125b469ee1cd10eb1f32a3423dfaab2.tar.gz | |
gnu: guile3.0-pfds: Do rename file extensions.
* gnu/packages/guile-xyz.scm (guile3.0-pfds)[arguments]: Inherit from
guile-pfds to include file extension renaming.
| -rw-r--r-- | gnu/packages/guile-xyz.scm | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e9a15babfb..58fab1ac7d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -773,38 +773,17 @@ Vicare Scheme and IronScheme. Right now it contains: (name "guile3.0-pfds") (native-inputs `(("guile" ,guile-3.0))) (arguments - '(#:source-directory "src" - #:compile-flags '("--r6rs") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'move-files-around - (lambda _ - ;; See bug #39210. - (substitute* '("fingertrees.sls" - "queues/private/condition.sls" - "deques/private/condition.sls") - (("&assertion") "&violation")) - ;; Move files under a pfds/ directory to reflect the module - ;; hierarchy. - (mkdir-p "src/pfds") - (for-each (lambda (file) - (rename-file file - (string-append "src/pfds/" - file))) - '("bbtrees.sls" - "deques" - "deques.sls" - "dlists.sls" - "fingertrees.sls" - "hamts.sls" - "heaps.sls" - "private" - "psqs.sls" - "queues" - "queues.sls" - "sequences.sls" - "sets.sls")) - #t))))))) + (substitute-keyword-arguments (package-arguments guile-pfds) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'work-around-guile-bug + (lambda _ + ;; See bug #39210. + (substitute* '("fingertrees.sls" + "queues/private/condition.sls" + "deques/private/condition.sls") + (("&assertion") "&violation")) + #t)))))))) (define-public guile-aa-tree (package |