lispPackages_new: fixed a bunch of packages

magicl, cl-cairo2, cl-ana, gsll, cl-libyaml, cl-libxml2, cl-readline
This commit is contained in:
Kasper Gałkowski 2022-10-11 17:41:55 +02:00
parent 6d0a5679c3
commit ae9cb7be8c
3 changed files with 49 additions and 0 deletions

View File

@ -423,6 +423,13 @@ let
patches = [ ./patches/qtools-use-nix-libs.patch ];
};
magicl = build-with-compile-into-pwd {
inherit (ql.magicl) pname version src lispLibs;
nativeBuildInputs = [ pkgs.gfortran ];
nativeLibs = [ pkgs.openblas ];
patches = [ ./patches/magicl-dont-build-fortran-twice.patch ];
};
};
in packages

View File

@ -0,0 +1,21 @@
--- a/magicl.asd
+++ b/magicl.asd
@@ -143,6 +143,7 @@
(shared-object (make-pathname :type #+darwin "dylib" #-darwin "so"
:name "libexpokit"
:defaults fortran-file)))
+ (unless (probe-file (nn shared-object))
(uiop:run-program
(list "gfortran" "-fPIC" "-std=legacy"
"-c"
@@ -155,7 +156,7 @@
(nn object-file)
#+darwin "-lblas"
#+darwin "-llapack"))
- (delete-file object-file))))
+ (delete-file object-file)))))
(asdf:defsystem #:magicl/ext-expokit
Diff finished. Mon Oct 10 22:03:54 2022

View File

@ -19,6 +19,9 @@ let
cl-cffi-gtk-cairo = pkg: {
nativeLibs = [ cairo ];
};
cl-cairo2 = pkg: {
nativeLibs = [ cairo ];
};
cl-cffi-gtk-gdk = pkg: {
nativeLibs = [ gtk3 ];
};
@ -130,6 +133,24 @@ let
nativeLibs = [ libfixposix ];
systems = [ "iolib" "iolib/os" "iolib/pathnames" ];
};
"cl-ana.hdf-cffi" = pkg: {
nativeBuildInputs = [ hdf5 ];
nativeLibs = [ hdf5 ];
NIX_LDFLAGS = [ "-lhdf5" ];
};
gsll = pkg: {
nativeBuildInputs = [ gsl ];
nativeLibs = [ gsl ];
};
cl-libyaml = pkg: {
nativeLibs = [ libyaml ];
};
cl-libxml2 = pkg: {
nativeLibs = [ libxml2 ];
};
cl-readline = pkg: {
nativeLibs = [ readline ];
};
};
qlpkgs =