push

modules/software/compatibility/nix-ld.nix

@@ -4,13 +4,19 @@
     nixos =
       { pkgs, options, ... }:
       {
-        programs.nix-ld = {
+        programs.nix-ld = let
+          libxml2-so2-compat = pkgs.runCommand "libxml2-so2-compat" { } ''
+            mkdir -p $out/lib
+            ln -s ${pkgs.libxml2.out}/lib/libxml2.so.16 $out/lib/libxml2.so.2
+          '';
+        in {
           enable = true;
 
           libraries =
             options.programs.nix-ld.libraries.default
             ++ (with pkgs; [
-              libxml2
+              libxml2-so2-compat
+
               udev
               gcc
               egl-wayland
@@ -31,7 +37,25 @@
               libz
               libGL
 
-              glib
+              xcbutil
+              xcbutilimage
+              xcbutilkeysyms
+              xcbutilrenderutil
+              xcbutilwm
+
+              libXrender
+              libXext
+              libXfixes
+              libSM
+              libICE
+              systemd
+              stdenv.cc.cc.lib
+              zlib
+              fontconfig.lib
+              freetype
+              libxkbcommon
+              dbus.lib
+              libidn2
             ]);
         };
       };

modules/software/utilities/cad.nix

@@ -22,8 +22,8 @@
           exec "$@"
         '';
 
-        blenderWithAddons = pkgs.symlinkJoin {
+        blender-quadremesher = pkgs.symlinkJoin {
-          name = "blender-with-addons";
+          name = "blender-quadremesher";
           paths = [ pkgs.blender ];
           nativeBuildInputs = [ pkgs.makeWrapper ];
           postBuild = ''
@@ -32,7 +32,7 @@
               --set QUADREMESHER_LAUNCHER ${quadRemesherLauncher}
           '';
         };
-      in [ blenderWithAddons ];
+      in [ blender-quadremesher ];
     };
   };
 }