diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2019-08-22 14:24:37 -0400
committerMark H Weaver <mhw@netris.org>2019-08-22 14:24:37 -0400
commit888e477bf82452028fb188ec94e793bd04f98d55 (patch)
tree3269991e1b3b6b3e02624414d11d787b431cc25c
parentd020821c0bd2206a5f3d4db155f2a9a3de7dc670 (diff)
downloadguix-888e477bf82452028fb188ec94e793bd04f98d55.tar.gz
guix-888e477bf82452028fb188ec94e793bd04f98d55.zip
Revert "import: utils: Add hash-ref*."
This reverts commit 8a3b11d1eb21e54b4f3a3cbceffed8ce2c11512e.
-rw-r--r--guix/import/utils.scm10
1 files changed, 0 insertions, 10 deletions
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index ed6c3ce6af..2a3b7341fb 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -47,7 +47,6 @@
flatten
assoc-ref*
- hash-ref*
url-fetch
guix-hash-url
@@ -117,15 +116,6 @@ recursively apply the procedure to the sub-list."
(assoc-ref alist key)
(apply assoc-ref* (assoc-ref alist key) rest)))
-(define (hash-ref* hash-table key . rest)
- "Return the value for KEY from HASH-TABLE. For each additional key specified,
-recursively apply the procedure to the sub-hash-table."
- (if (hash-table? hash-table)
- (if (null? rest)
- (hash-ref hash-table key)
- (apply hash-ref* (hash-ref hash-table key) rest))
- #f)) ; For consistency with assoc-ref*
-
(define (url-fetch url file-name)
"Save the contents of URL to FILE-NAME. Return #f on failure."
(parameterize ((current-output-port (current-error-port)))
- ;; spreadsheet inside an Abiword document. So presumably when we
- ;; package Abiword we'll have to refer it to this directory.
- (substitute* "configure"
- (("^GOFFICE_PLUGINS_DIR=.*")
- (string-append "GOFFICE_PLUGINS_DIR="
- (assoc-ref outputs "out") "/goffice/plugins"))))
- %standard-phases)))
+ (modify-phases %standard-phases
+ (add-before
+ 'configure 'pre-conf
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Make install tries to write into the directory of goffice
+ ;; I am informed that this only affects the possibility to embed a
+ ;; spreadsheet inside an Abiword document. So presumably when we
+ ;; package Abiword we'll have to refer it to this directory.
+ (substitute* "configure"
+ (("^GOFFICE_PLUGINS_DIR=.*")
+ (string-append "GOFFICE_PLUGINS_DIR="
+ (assoc-ref outputs "out")
+ "/goffice/plugins"))))))))
(inputs
`(("glib" ,glib)
("gtk+" ,gtk+)
("goffice" ,goffice)
("libgsf" ,libgsf)
+ ("librsvg" ,librsvg)
("libxml2" ,libxml2)
+ ("libxslt" ,libxslt)
("zlib" ,zlib)))
(native-inputs
`(("intltool" ,intltool)