diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-03-22 22:58:19 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-22 23:15:34 +0100 |
| commit | 128663e4c8e8e3c2a56686c6018641ce7bcf92da (patch) | |
| tree | d00d6111c828fb7d9a16874afba1d4a065ae32d8 /gnu | |
| parent | 238f739777f3634c3a987d834519d692216027d0 (diff) | |
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.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm index 821246bc385..b639541788a 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm | |||
| @@ -61,14 +61,12 @@ | |||
| 61 | 61 | ||
| 62 | (define (search-patch file-name) | 62 | (define (search-patch file-name) |
| 63 | "Search the patch FILE-NAME." | 63 | "Search the patch FILE-NAME." |
| 64 | (with-fluids ((%file-port-name-canonicalization #f)) | 64 | (search-path (%patch-path) file-name)) |
| 65 | (search-path (%patch-path) file-name))) | ||
| 66 | 65 | ||
| 67 | (define (search-bootstrap-binary file-name system) | 66 | (define (search-bootstrap-binary file-name system) |
| 68 | "Search the bootstrap binary FILE-NAME for SYSTEM." | 67 | "Search the bootstrap binary FILE-NAME for SYSTEM." |
| 69 | (with-fluids ((%file-port-name-canonicalization #f)) | 68 | (search-path (%bootstrap-binaries-path) |
| 70 | (search-path (%bootstrap-binaries-path) | 69 | (string-append system "/" file-name))) |
| 71 | (string-append system "/" file-name)))) | ||
| 72 | 70 | ||
| 73 | (define %distro-module-directory | 71 | (define %distro-module-directory |
| 74 | ;; Absolute path of the (gnu packages ...) module root. | 72 | ;; Absolute path of the (gnu packages ...) module root. |
