coderofsalvation/xrforge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replaced static packages with normal packages

Browse source
This commit is contained in:
Leon van Kammen 2025-12-04 22:47:35 +01:00
parent 919a9461aa
commit 84a2812ad5
1 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
nix/docker.nix
View file

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