lisp-modules.mcclim: fix build failure

Introduce out-of-tree fixes to McCLIM build from
https://github.com/Uthar/nix-cl/issues/32
This commit is contained in:
Luke Gorrie 2023-04-14 13:26:02 +02:00
parent 9063e1b268
commit 0afe48b332
2 changed files with 15 additions and 1 deletions

View File

@ -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 = [ ];
};
});

View File

@ -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 =