From 3326c4bbec9a0e15dac36c0719f0fddfb559cb9a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Jun 2021 08:52:14 +1000 Subject: [PATCH] runc: use buildGoModule --- pkgs/applications/virtualization/runc/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 795971a74920..b3578e175d49 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGoPackage +, buildGoModule , go-md2man , installShellFiles , pkg-config @@ -14,7 +14,7 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "runc"; version = "1.0.0-rc95"; @@ -25,7 +25,7 @@ buildGoPackage rec { sha256 = "sha256-q4sXcvJO9gyo7m0vlaMrwh7ZZHYa58FJy3GatWndS6M="; }; - goPackagePath = "github.com/opencontainers/runc"; + vendorSha256 = null; outputs = [ "out" "man" ]; nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ]; @@ -36,7 +36,6 @@ buildGoPackage rec { buildPhase = '' runHook preBuild - cd go/src/${goPackagePath} patchShebangs . make ${toString makeFlags} runc man runHook postBuild