From 0afe48b3323af2a05f753e747f000a0118ef26a3 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@nuddy.net>
Date: Fri, 14 Apr 2023 13:26:02 +0200
Subject: lisp-modules.mcclim: fix build failure

Introduce out-of-tree fixes to McCLIM build from
https://github.com/Uthar/nix-cl/issues/32
---
 pkgs/development/lisp-modules/imported.nix |  1 -
 pkgs/development/lisp-modules/ql.nix       | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'pkgs/development/lisp-modules')

diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix
index 1757d9a4783f..be4add0edfb4 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 a7f6573ad93a..0517a527cc38 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 =
-- 
cgit 1.4.1


From f6b48239e43284fb39941897db633abcc2d80d52 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@nuddy.net>
Date: Fri, 14 Apr 2023 14:50:34 +0200
Subject: lisp-modules.mcclim-layouts: fix build

---
 pkgs/development/lisp-modules/ql.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'pkgs/development/lisp-modules')

diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix
index 0517a527cc38..71043571275d 100644
--- a/pkgs/development/lisp-modules/ql.nix
+++ b/pkgs/development/lisp-modules/ql.nix
@@ -218,6 +218,12 @@ let
         self.mcclim-fonts
       ];
     });
+    mcclim-layouts = super.mcclim-layouts.overrideLispAttrs (o: {
+      systems = [ "mcclim-layouts" "mcclim-layouts/tab" ];
+      lispLibs = o.lispLibs ++ [
+        self.mcclim
+      ];
+});
   });
 
   qlpkgs =
-- 
cgit 1.4.1


From 3bce72b7e950a9840be42bc376afed54cd347ad6 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@nuddy.net>
Date: Fri, 14 Apr 2023 14:51:44 +0200
Subject: lisp-modules.polyclot: init from trunk

Polyclot is a McCLIM-based "Grammar of Graphics" plotting library.

This package is not yet in Quicklisp.
---
 pkgs/development/lisp-modules/packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'pkgs/development/lisp-modules')

diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 55cf5c29e22f..9f9b227265da 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -579,6 +579,18 @@ let
     ];
   };
 
+  polyclot = build-asdf-system {
+    pname = "polyclot";
+    version = "trunk";
+    src = pkgs.fetchfossil {
+      url = "https://fossil.turtleware.eu/polyclot";
+      rev = "e678b3c3e002f53b446780406c9ed13f8451309d22a1dc50ced4dbeedf08a1ec";
+      sha256 = "sha256-J08bU9HSVbzEivYtQsyIYPZJTrugj+jJSa4LglS0Olg=";
+    };
+    systems = [ "eu.turtleware.polyclot" "eu.turtleware.polyclot/demo" ];
+    lispLibs = with super; [ clim mcclim mcclim-layouts ];
+  };
+
   });
 
 in packages
-- 
cgit 1.4.1