diff --git a/distros/nix/cli-cross.nix b/distros/nix/cli-cross.nix index d7a1e27..11a3ea7 100644 --- a/distros/nix/cli-cross.nix +++ b/distros/nix/cli-cross.nix @@ -15,7 +15,6 @@ in version = version; src = srcWithProtobuf; modRoot = "./go"; - # Use lib.fakeHash when updating deps inherit vendorHash; # Avoids workspace mode error proxyVendor = true; diff --git a/distros/nix/server.nix b/distros/nix/server.nix index eae0434..51a3b9d 100644 --- a/distros/nix/server.nix +++ b/distros/nix/server.nix @@ -1,8 +1,19 @@ { - lib, stdenv, makeWrapper, version, buildkit, cli + lib, stdenv, makeWrapper, version, cli, + buildkit, slirp4netns, rootlesskit, runc, cni, buildkit-cni-plugins, + util-linux, iproute2 }: let - runtimeDeps = [ buildkit ]; + runtimeDeps = [ + slirp4netns + rootlesskit + runc + cni + buildkit-cni-plugins + buildkit + util-linux # unshare,nsenter for rootlesskit + iproute2 # ip for slirp4netns + ]; in stdenv.mkDerivation { pname = "ayup-server"; diff --git a/flake.nix b/flake.nix index 5cfa0eb..e330045 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ GOARCH = "amd64"; }; server = pkgs.callPackage ./distros/nix/server.nix { - inherit version cli; + inherit version cli buildkit-cni-plugins; }; in {