From 84a2812ad5caa8ab5ff1b38a0fa2b74060611426 Mon Sep 17 00:00:00 2001
From: Leon van Kammen <leonvankammen@gmail.com>
Date: Thu, 4 Dec 2025 22:47:35 +0100
Subject: [PATCH] replaced static packages with normal packages

---
 nix/docker.nix | 51 +++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/nix/docker.nix b/nix/docker.nix
index 83ce7d2..487ec9c 100644
--- a/nix/docker.nix
+++ b/nix/docker.nix
@@ -38,18 +38,18 @@ let
       finalImageTag = "latest";                         
   };
 
-  # generate the reproducable blob below via:
-  # $ nix-shell -p nix-prefetch-github --command 'nix-prefetch-github assimp assimp --rev e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5'
-  assimpSrc = pkgs.fetchFromGitHub {
-      "owner" = "assimp";
-      "repo"  = "assimp";
-      "rev"   = "e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5";
-      "hash"  = "sha256-ja5pFwpnzLT2MDIR8ISwC6+eA5UXyqRZW2CMCCrF1Q0=";
-  };
-  myAssimp = pkgs.pkgsStatic.assimp.overrideAttrs (oldAttrs: {
-    inherit assimpSrc; # Set the source to the fetched commit
-    src = assimpSrc;
-  });
+  ## generate the reproducable blob below via:
+  ## $ nix-shell -p nix-prefetch-github --command 'nix-prefetch-github assimp assimp --rev e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5'
+  #assimpSrc = pkgs.fetchFromGitHub {
+  #    "owner" = "assimp";
+  #    "repo"  = "assimp";
+  #    "rev"   = "e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5";
+  #    "hash"  = "sha256-ja5pFwpnzLT2MDIR8ISwC6+eA5UXyqRZW2CMCCrF1Q0=";
+  #};
+  #myAssimp = pkgs.pkgsStatic.assimp.overrideAttrs (oldAttrs: {
+  #  inherit assimpSrc; # Set the source to the fetched commit
+  #  src = assimpSrc;
+  #});
 
 
 in
@@ -64,20 +64,22 @@ rec
     fromImage = manyfoldImage;
 
     # add nix pkgs + local files
-    contents = pkgs.buildEnv {
+    copyToRoot = pkgs.buildEnv {
       name = "image-root";
       pathsToLink = ["/manyfold" "/bin" ];
       paths = [
-        pkgs.pkgsStatic.rsync
-        pkgs.pkgsStatic.sqlite
-        pkgs.pkgsStatic.rclone
-        pkgs.pkgsStatic.fuse3
-        pkgs.pkgsStatic.acl           # getfacl e.g.
-        pkgs.pkgsStatic.inotify-tools # inotifywait e.g.
-        pkgs.pkgsStatic.zip           # inotifywait e.g.
-        pkgs.pkgsStatic.ts            # job management 
-        myAssimp                      # cli 3D editing/conversion 
-        ./..
+        #pkgs.pkgsStatic.rsync
+        pkgs.rsync
+        pkgs.sqlite
+        pkgs.rclone
+        pkgs.fuse3
+        #pkgs.acl            # getfacl e.g.
+        #pkgs.inotify-tools  # inotifywait e.g.
+        pkgs.zip             # inotifywait e.g.
+        pkgs.assimp
+        ##pkgs.ts            # job management 
+        #myAssimp            # updated build of assimp
+        ../.
       ];
     };
 
@@ -85,6 +87,9 @@ rec
       Cmd = ["/init"];
       # We substitute the /init entrypoing with our own wrapper 
       EntryPoint = ["/manyfold/cli/manyfold.sh" "boot"];
+      Env = [
+        "LD_PRELOAD=" # unset LD_PRELOAD (some package is setting it a nonexisting lib)
+      ];
     };
   };