Commit 0afe48b3 authored by Luke Gorrie's avatar Luke Gorrie
Browse files

lisp-modules.mcclim: fix build failure 

Introduce out-of-tree fixes to McCLIM build from
https://github.com/Uthar/nix-cl/issues/32
parent 9063e1b2

pkgs/development/lisp-modules/imported.nix

+0 −1
Original line number Diff line number Diff line
@@ -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 = [  ];

    };

  });

pkgs/development/lisp-modules/ql.nix

+15 −0
Original line number Diff line number Diff line
@@ -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 =