sbclPackages.math: fix build
There was a compile-time pathname into the home directory. It was patched to be a function that works on run-time.
This commit is contained in:
parent
a0bdaf345b
commit
653ba45834
|
@ -85,7 +85,6 @@ in lib.makeScope pkgs.newScope (self: {")
|
||||||
"hu.dwim.quasi-quote"
|
"hu.dwim.quasi-quote"
|
||||||
;; Tries to write in $HOME
|
;; Tries to write in $HOME
|
||||||
"ubiquitous"
|
"ubiquitous"
|
||||||
"math"
|
|
||||||
;; Upstream bad packaging, multiple systems in clml.blas.asd
|
;; Upstream bad packaging, multiple systems in clml.blas.asd
|
||||||
"clml.blas.hompack"
|
"clml.blas.hompack"
|
||||||
;; Fails on SBCL due to heap exhaustion
|
;; Fails on SBCL due to heap exhaustion
|
||||||
|
|
|
@ -39439,9 +39439,6 @@ in lib.makeScope pkgs.newScope (self: {
|
||||||
});
|
});
|
||||||
systems = [ "math" ];
|
systems = [ "math" ];
|
||||||
lispLibs = [ (getAttr "cl-utilities" self) (getAttr "font-discovery" self) (getAttr "gsll" self) (getAttr "vgplot" self) ];
|
lispLibs = [ (getAttr "cl-utilities" self) (getAttr "font-discovery" self) (getAttr "gsll" self) (getAttr "vgplot" self) ];
|
||||||
meta = {
|
|
||||||
broken = true;
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
mathkit = (build-asdf-system {
|
mathkit = (build-asdf-system {
|
||||||
pname = "mathkit";
|
pname = "mathkit";
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
--- a/src/gnuplot/gnuplot.lisp
|
||||||
|
+++ b/src/gnuplot/gnuplot.lisp
|
||||||
|
@@ -24,8 +24,13 @@
|
||||||
|
|
||||||
|
(in-package :math/gnuplot)
|
||||||
|
|
||||||
|
-(defparameter *default-gnuplot-direcroty*
|
||||||
|
- (ensure-directories-exist #P"~/gnuplot/"))
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+(defun default-gnuplot-directory ()
|
||||||
|
+ (let ((directory (merge-pathnames
|
||||||
|
+ (make-pathname :directory '(:relative "gnuplot"))
|
||||||
|
+ (user-homedir-pathname))))
|
||||||
|
+ (ensure-directories-exist directory)))
|
||||||
|
|
||||||
|
;;;; (directory-namestring *default-gnuplot-direcroty*)
|
||||||
|
|
||||||
|
@@ -33,9 +38,9 @@
|
||||||
|
(assert (stringp f-name))
|
||||||
|
(assert (stringp f-ext))
|
||||||
|
(if (string= "" f-ext)
|
||||||
|
- (concatenate 'string (directory-namestring *default-gnuplot-direcroty*)
|
||||||
|
+ (concatenate 'string (directory-namestring (default-gnuplot-directory))
|
||||||
|
f-name f-ext)
|
||||||
|
- (concatenate 'string (directory-namestring *default-gnuplot-direcroty*)
|
||||||
|
+ (concatenate 'string (directory-namestring (default-gnuplot-directory))
|
||||||
|
f-name "." f-ext)))
|
||||||
|
|
||||||
|
(defun find-font-family (&key (family "Times New Roman"))
|
||||||
|
|
||||||
|
Diff finished. Fri Mar 10 20:05:26 2023
|
|
@ -199,6 +199,10 @@ let
|
||||||
hu_dot_dwim_dot_graphviz = super.hu_dot_dwim_dot_graphviz.overrideLispAttrs (o: {
|
hu_dot_dwim_dot_graphviz = super.hu_dot_dwim_dot_graphviz.overrideLispAttrs (o: {
|
||||||
nativeLibs = [ pkgs.graphviz ];
|
nativeLibs = [ pkgs.graphviz ];
|
||||||
});
|
});
|
||||||
|
math = super.math.overrideLispAttrs (o: {
|
||||||
|
patches = [ ./patches/math-no-compile-time-directory.patch ];
|
||||||
|
nativeLibs = [ pkgs.fontconfig ];
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
qlpkgs =
|
qlpkgs =
|
||||||
|
|
Loading…
Reference in a new issue