summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-03-22 22:58:19 +0100
committerLudovic Courtès <ludo@gnu.org>2013-03-22 23:15:34 +0100
commit128663e4c8e8e3c2a56686c6018641ce7bcf92da (patch)
treed00d6111c828fb7d9a16874afba1d4a065ae32d8 /gnu
parent238f739777f3634c3a987d834519d692216027d0 (diff)
downloadguix-128663e4c8e8e3c2a56686c6018641ce7bcf92da.tar.gz
store: Really disable file name canonicalization for derivation inputs.
* guix/store.scm (write-contents)[call-with-binary-input-file]: Set
  %FILE-PORT-NAME-CANONICALIZATION to #f.
* gnu/packages.scm (search-patch, search-bootstrap-binary): Leave
  %FILE-PORT-NAME-CANONICALIZATION unchanged.  This reverts 9776ebb.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages.scm8
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm
index 821246bc38..b639541788 100644
--- a/gnu/packages.scm
+++ b/gnu/packages.scm
@@ -61,14 +61,12 @@
 
 (define (search-patch file-name)
   "Search the patch FILE-NAME."
-  (with-fluids ((%file-port-name-canonicalization #f))
-    (search-path (%patch-path) file-name)))
+  (search-path (%patch-path) file-name))
 
 (define (search-bootstrap-binary file-name system)
   "Search the bootstrap binary FILE-NAME for SYSTEM."
-  (with-fluids ((%file-port-name-canonicalization #f))
-    (search-path (%bootstrap-binaries-path)
-                 (string-append system "/" file-name))))
+  (search-path (%bootstrap-binaries-path)
+               (string-append system "/" file-name)))
 
 (define %distro-module-directory
   ;; Absolute path of the (gnu packages ...) module root.