Merge pull request #202904 from infinisil/fix/lisp-png

pkgs/development/lisp-modules-new/ql.nix

@@ -9,42 +9,29 @@ let
 
   # FIXME: automatically add nativeLibs based on conditions signalled
 
+  # Try to keep this list sorted
   extras = {
+    cffi-libffi = pkg: {
+      nativeBuildInputs = [ libffi ];
+      nativeLibs = [ libffi ];
+    };
     "cl+ssl" = pkg: {
       nativeLibs = [ openssl_1_1 ];
     };
+    "cl-ana.hdf-cffi" = pkg: {
+      nativeBuildInputs = [ pkgs.hdf5 ];
+      nativeLibs = [ pkgs.hdf5 ];
+      NIX_LDFLAGS = [ "-lhdf5" ];
+    };
+    cl-async-ssl = pkg: {
+      nativeLibs = [ openssl_1_1 ];
+    };
     cl-cffi-gtk-glib = pkg: {
       nativeLibs = [ glib ];
     };
     cl-cffi-gtk-cairo = pkg: {
       nativeLibs = [ cairo ];
     };
-    cl-cairo2 = pkg: {
-      nativeLibs = [ cairo ];
-    };
-    cl-cairo2-xlib = pkg: {
-      nativeLibs = [ gtk2-x11 ];
-    };
-    cl-freetype2 = pkg: {
-      nativeLibs = [ freetype ];
-      nativeBuildInputs = [ freetype ];
-      patches = [ ./patches/cl-freetype2-fix-grovel-includes.patch ];
-    };
-    cl-pango = pkg: {
-      nativeLibs = [ pango ];
-    };
-    cl-gtk2-gdk = pkg: {
-      nativeLibs = [ gtk2-x11 ];
-    };
-    cl-gtk2-glib = pkg: {
-      nativeLibs = [ glib ];
-    };
-    cl-gtk2-pango = pkg: {
-      nativeLibs = [ pango ];
-    };
-    cl-rsvg2 = pkg: {
-      nativeLibs = [ librsvg ];
-    };
     cl-cffi-gtk-gdk = pkg: {
       nativeLibs = [ gtk3 ];
     };
@@ -54,53 +41,66 @@ let
     cl-cffi-gtk-pango = pkg: {
       nativeLibs = [ pango ];
     };
+    cl-cairo2 = pkg: {
+      nativeLibs = [ cairo ];
+    };
+    cl-cairo2-xlib = pkg: {
+      nativeLibs = [ gtk2-x11 ];
+    };
+    cl-devil = pkg: {
+      nativeBuildInputs = [ pkgs.libdevil ];
+      nativeLibs = [ pkgs.libdevil ];
+    };
+    cl-freetype2 = pkg: {
+      nativeLibs = [ freetype ];
+      nativeBuildInputs = [ freetype ];
+      patches = [ ./patches/cl-freetype2-fix-grovel-includes.patch ];
+    };
+    cl-glfw = pkg: {
+      nativeLibs = [ glfw ];
+    };
+    cl-glfw-opengl-core = pkg: {
+      nativeLibs = [ libGL ];
+    };
+    cl-glfw3 = pkg: {
+      nativeLibs = [ glfw ];
+    };
+    cl-glu = pkg: {
+      nativeLibs = [ libGLU ];
+    };
+    cl-glut = pkg: {
+      nativeLibs = [ freeglut ];
+    };
     cl-gobject-introspection = pkg: {
       nativeLibs = [ glib gobject-introspection ];
     };
-    cl-mysql = pkg: {
-      nativeLibs = [ mariadb.client ];
+    cl-gtk2-gdk = pkg: {
+      nativeLibs = [ gtk2-x11 ];
     };
-    clsql-postgresql = pkg: {
-      nativeLibs = [ postgresql.lib ];
+    cl-gtk2-glib = pkg: {
+      nativeLibs = [ glib ];
     };
-    clsql-sqlite3 = pkg: {
-      nativeLibs = [ sqlite ];
-    };
-    cl-webkit2 = pkg: {
-      nativeLibs = [ webkitgtk ];
-    };
-    dbd-mysql = pkg: {
-      nativeLibs = [ mariadb.client ];
-    };
-    lla = pkg: {
-      nativeLibs = [ openblas ];
-    };
-    cffi-libffi = pkg: {
-      nativeBuildInputs = [ libffi ];
-      nativeLibs = [ libffi ];
-    };
-    cl-rabbit = pkg: {
-      nativeBuildInputs = [ rabbitmq-c ];
-      nativeLibs = [ rabbitmq-c ];
-    };
-    trivial-ssh-libssh2 = pkg: {
-      nativeLibs = [ libssh2 ];
-    };
-    mssql = pkg: {
-      nativeLibs = [ freetds ];
-    };
-    sqlite = pkg: {
-      nativeLibs = [ sqlite ];
-    };
-    cl-libuv = pkg: {
-      nativeBuildInputs = [ libuv ];
-      nativeLibs = [ libuv ];
+    cl-gtk2-pango = pkg: {
+      nativeLibs = [ pango ];
     };
     cl-liballegro = pkg: {
       # build doesnt fail without this, but fails on runtime
       # weird...
       nativeLibs = [ allegro5 ];
     };
+    cl-libuv = pkg: {
+      nativeBuildInputs = [ libuv ];
+      nativeLibs = [ libuv ];
+    };
+    cl-libxml2 = pkg: {
+      nativeLibs = [ pkgs.libxml2 ];
+    };
+    cl-libyaml = pkg: {
+      nativeLibs = [ pkgs.libyaml ];
+    };
+    cl-mysql = pkg: {
+      nativeLibs = [ mariadb.client ];
+    };
     cl-ode = pkg: {
       nativeLibs = let
         ode' = ode.overrideAttrs (o: {
@@ -111,68 +111,76 @@ let
         });
       in [ ode' ];
     };
-    classimp = pkg: {
-      nativeLibs = [ assimp ];
-    };
-    sdl2 = pkg: {
-      nativeLibs = [ SDL2 ];
-    };
-    lispbuilder-sdl-cffi = pkg: {
-      nativeLibs = [ SDL ];
-    };
     cl-opengl = pkg: {
       nativeLibs = [ libGL ];
     };
-    cl-glu = pkg: {
-      nativeLibs = [ libGLU ];
+    cl-pango = pkg: {
+      nativeLibs = [ pango ];
     };
-    cl-glut = pkg: {
-      nativeLibs = [ freeglut ];
-    };
-    cl-glfw = pkg: {
-      nativeLibs = [ glfw ];
-    };
-    cl-glfw-opengl-core = pkg: {
-      nativeLibs = [ libGL ];
-    };
-    cl-glfw3 = pkg: {
-      nativeLibs = [ glfw ];
-    };
-    lev = pkg: {
-      nativeLibs = [ libev ];
+    cl-rabbit = pkg: {
+      nativeBuildInputs = [ rabbitmq-c ];
+      nativeLibs = [ rabbitmq-c ];
     };
     cl-rdkafka = pkg: {
       nativeBuildInputs = [ rdkafka ];
       nativeLibs = [ rdkafka ];
     };
-    cl-async-ssl = pkg: {
-      nativeLibs = [ openssl_1_1 ];
+    cl-readline = pkg: {
+      nativeLibs = [ pkgs.readline ];
     };
-    osicat = pkg: {
-      LD_LIBRARY_PATH = "${pkg}/posix/";
+    cl-rsvg2 = pkg: {
+      nativeLibs = [ librsvg ];
+    };
+    "cl-sat.glucose" = pkg: {
+      propagatedBuildInputs = [ pkgs.glucose ];
+      patches = [ ./patches/cl-sat.glucose-binary-from-PATH-if-present.patch ];
+
+    };
+    "cl-sat.minisat" = pkg: {
+      propagatedBuildInputs = [ pkgs.minisat ];
+    };
+    cl-webkit2 = pkg: {
+      nativeLibs = [ webkitgtk ];
+    };
+    classimp = pkg: {
+      nativeLibs = [ assimp ];
+    };
+    clsql-postgresql = pkg: {
+      nativeLibs = [ postgresql.lib ];
+    };
+    clsql-sqlite3 = pkg: {
+      nativeLibs = [ sqlite ];
+    };
+    dbd-mysql = pkg: {
+      nativeLibs = [ mariadb.client ];
+    };
+    gsll = pkg: {
+      nativeBuildInputs = [ pkgs.gsl ];
+      nativeLibs = [ pkgs.gsl ];
     };
     iolib = pkg: {
       nativeBuildInputs = [ libfixposix ];
       nativeLibs = [ libfixposix ];
       systems = [ "iolib" "iolib/os" "iolib/pathnames" ];
     };
-    "cl-ana.hdf-cffi" = pkg: {
-      nativeBuildInputs = [ pkgs.hdf5 ];
-      nativeLibs = [ pkgs.hdf5 ];
-      NIX_LDFLAGS = [ "-lhdf5" ];
+    lev = pkg: {
+      nativeLibs = [ libev ];
     };
-    gsll = pkg: {
-      nativeBuildInputs = [ pkgs.gsl ];
-      nativeLibs = [ pkgs.gsl ];
+    lispbuilder-sdl-cffi = pkg: {
+      nativeLibs = [ SDL ];
     };
-    cl-libyaml = pkg: {
-      nativeLibs = [ pkgs.libyaml ];
+    lla = pkg: {
+      nativeLibs = [ openblas ];
     };
-    cl-libxml2 = pkg: {
-      nativeLibs = [ pkgs.libxml2 ];
+    mssql = pkg: {
+      nativeLibs = [ freetds ];
     };
-    cl-readline = pkg: {
-      nativeLibs = [ pkgs.readline ];
+    osicat = pkg: {
+      LD_LIBRARY_PATH = "${pkg}/posix/";
+    };
+    png = pkg: {
+      nativeBuildInputs = [ pkgs.libpng ];
+      nativeLibs = [ pkgs.libpng ];
     };
     pzmq = pkg: {
       nativeBuildInputs = [ pkgs.zeromq ];
@@ -190,16 +198,21 @@ let
       nativeBuildInputs = [ pkgs.zeromq ];
       nativeLibs = [ pkgs.zeromq ];
     };
+    sdl2 = pkg: {
+      nativeLibs = [ SDL2 ];
+    };
+    sqlite = pkg: {
+      nativeLibs = [ sqlite ];
+    };
     trivial-package-manager = pkg: {
       propagatedBuildInputs = [ pkgs.which ];
     };
-    "cl-sat.glucose" = pkg: {
-      propagatedBuildInputs = [ pkgs.glucose ];
-      patches = [ ./patches/cl-sat.glucose-binary-from-PATH-if-present.patch ];
-
+    trivial-ssh-libssh2 = pkg: {
+      nativeLibs = [ libssh2 ];
     };
-    "cl-sat.minisat" = pkg: {
-      propagatedBuildInputs = [ pkgs.minisat ];
+    zmq = pkg: {
+      nativeBuildInputs = [ pkgs.zeromq ];
+      nativeLibs = [ pkgs.zeromq ];
     };
   };