diff --git a/Makefile b/Makefile index 377c17f7c63..b01e8d5d61e 100644 --- a/Makefile +++ b/Makefile @@ -210,9 +210,9 @@ bin/crio-status: $(GO_FILES) .gopathok $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio-status build-static: - $(CONTAINER_RUNTIME) run --rm --privileged -ti -v /:/mnt \ + $(CONTAINER_RUNTIME) run --network=host --rm --privileged -ti -v /:/mnt \ $(NIX_IMAGE) cp -rfT /nix /mnt/nix - $(CONTAINER_RUNTIME) run --rm --privileged -ti -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} \ + $(CONTAINER_RUNTIME) run --network=host --rm --privileged -ti -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} \ $(NIX_IMAGE) nix --print-build-logs --option cores 8 --option max-jobs 8 build --file nix/ mkdir -p bin cp -r result/bin bin/static diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix index 21e7f17a2e8..d0c7d4a85b2 100644 --- a/nix/nixpkgs.nix +++ b/nix/nixpkgs.nix @@ -2,7 +2,7 @@ let json = builtins.fromJSON (builtins.readFile ./nixpkgs.json); nixpkgs = import (builtins.fetchTarball { name = "nixos-unstable"; - url = "${json.url}/archive/${json.rev}.tar.gz"; + url = "${json.url}/tarball/${json.rev}"; inherit (json) sha256; }); in nixpkgs