diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 94ae7f527125..bf02a6ad5569 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -1,11 +1,9 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, git, Virtualization, testers, linuxkit }: -buildGoPackage rec { - pname = "linuxkit"; +buildGoModule rec { + pname = "linuxkit"; version = "1.0.0"; - goPackagePath = "github.com/linuxkit/linuxkit"; - src = fetchFromGitHub { owner = "linuxkit"; repo = "linuxkit"; @@ -13,15 +11,30 @@ buildGoPackage rec { sha256 = "sha256-y/jsMr7HmrHjVMn4fyQ3MPHION8hQO2G4udX1AMx8bk="; }; - subPackages = [ "src/cmd/linuxkit" ]; + vendorSha256 = null; - ldflags = [ "-s" "-w" "-X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev}" "-X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ]; + modRoot = "./src/cmd/linuxkit"; + + buildInputs = lib.optionals stdenv.isDarwin [ Virtualization ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=${version}" + ]; + + checkInputs = [ git ]; + + passthru.tests.version = testers.testVersion { + package = linuxkit; + command = "linuxkit version"; + }; meta = with lib; { description = "A toolkit for building secure, portable and lean operating systems for containers"; license = licenses.asl20; homepage = "https://github.com/linuxkit/linuxkit"; - maintainers = [ maintainers.nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bf589bfa543..c94fbe001f20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17029,7 +17029,9 @@ with pkgs; libwhich = callPackage ../development/tools/misc/libwhich { }; - linuxkit = callPackage ../development/tools/misc/linuxkit { }; + linuxkit = callPackage ../development/tools/misc/linuxkit { + inherit (darwin.apple_sdk_11_0.frameworks) Virtualization; + }; lit = callPackage ../development/tools/misc/lit { };