diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 21:56:34 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 22:30:04 +0300 |
| commit | de3c03a47160dec355d9b19ad5ca210d90c15fd7 (patch) | |
| tree | 4ca6dc05b5fc9530d812bbb269f1c61ab9efccf3 /gnu/packages/chez.scm | |
| parent | ab6fe9d362046231ad6f46eccfd1ea2c9c80b401 (diff) | |
| parent | b8477cab7bccc4191ed3dfa3f149aec7917834d8 (diff) | |
| download | guix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar guix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/chez.scm')
| -rw-r--r-- | gnu/packages/chez.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index b80421d3f7..df9d68a55c 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -240,7 +240,9 @@ and 32-bit PowerPC architectures.") `(("chez-scheme" ,chez-scheme))) (arguments `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out))) + (list (string-append "PREFIX=" out) + "CHEZ=chez-scheme --libdirs ./" + (string-append "chezversion=" ,(package-version chez-scheme)))) #:test-target "test" #:phases (modify-phases %standard-phases (delete 'configure)))) @@ -414,9 +416,13 @@ Chez Scheme.") ;; files. (define (chez-make-flags name version) `(let ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out) - (string-append "DOCDIR=" out "/share/doc/" - ,name "-" ,version)))) + (list + ;; Set 'chezversion' so that libraries are installed in + ;; 'lib/csvX.Y.Z-site' like Chez's 'native-search-paths' expects. + (string-append "chezversion=" ,(package-version chez-scheme)) + (string-append "PREFIX=" out) + (string-append "DOCDIR=" out "/share/doc/" + ,name "-" ,version)))) (define-public chez-matchable (package |