diff options
| author | Luke Gorrie <luke@nuddy.net> | 2023-04-14 13:26:02 +0200 |
|---|---|---|
| committer | Luke Gorrie <luke@nuddy.net> | 2023-04-14 13:26:02 +0200 |
| commit | 0afe48b3323af2a05f753e747f000a0118ef26a3 (patch) | |
| tree | 3fa3a07dfa1ca78d1e52000de9348dc37ed8f248 /pkgs/development/lisp-modules | |
| parent | 9063e1b268ed88986e3de883ad17aa0a2401d4db (diff) | |
| download | nixpkgs-0afe48b3323af2a05f753e747f000a0118ef26a3.tar nixpkgs-0afe48b3323af2a05f753e747f000a0118ef26a3.tar.gz nixpkgs-0afe48b3323af2a05f753e747f000a0118ef26a3.tar.bz2 nixpkgs-0afe48b3323af2a05f753e747f000a0118ef26a3.tar.lz nixpkgs-0afe48b3323af2a05f753e747f000a0118ef26a3.tar.xz nixpkgs-0afe48b3323af2a05f753e747f000a0118ef26a3.tar.zst nixpkgs-0afe48b3323af2a05f753e747f000a0118ef26a3.zip | |
lisp-modules.mcclim: fix build failure
Introduce out-of-tree fixes to McCLIM build from https://github.com/Uthar/nix-cl/issues/32
Diffstat (limited to 'pkgs/development/lisp-modules')
| -rw-r--r-- | pkgs/development/lisp-modules/imported.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/lisp-modules/ql.nix | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix index 1757d9a4783..be4add0edfb 100644 --- a/pkgs/development/lisp-modules/imported.nix +++ b/pkgs/development/lisp-modules/imported.nix @@ -48177,7 +48177,6 @@ in lib.makeScope pkgs.newScope (self: { systems = [ "mcclim-bezier" ]; lispLibs = [ (getAttr "clim" self) (getAttr "clim-pdf" self) (getAttr "clim-postscript" self) (getAttr "flexichain" self) (getAttr "mcclim-clx" self) (getAttr "mcclim-null" self) (getAttr "mcclim-render" self) ]; meta = { - broken = true; hydraPlatforms = [ ]; }; }); diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index a7f6573ad93..0517a527cc3 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -203,6 +203,21 @@ let patches = [ ./patches/math-no-compile-time-directory.patch ]; nativeLibs = [ pkgs.fontconfig ]; }); + mcclim-fonts = super.mcclim-fonts.overrideLispAttrs (o: { + lispLibs = o.lispLibs ++ [ + super.cl-dejavu + super.zpb-ttf + super.cl-vectors + super.cl-paths-ttf + super.flexi-streams + ]; + systems = [ "mcclim-fonts" "mcclim-fonts/truetype" ]; + }); + mcclim-render = super.mcclim-render.overrideLispAttrs (o: { + lispLibs = o.lispLibs ++ [ + self.mcclim-fonts + ]; + }); }); qlpkgs = |