diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-06-17 08:52:14 +1000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-07-18 20:00:43 +0000 |
| commit | c557fc6061f4a9e66f6ccd48c511cd2acd155da7 (patch) | |
| tree | 65d35e7f49378bccfe9d2f7a1bed72168ff85c64 | |
| parent | containerd: 1.5.1 -> 1.5.2, use buildGoModule (diff) | |
| download | nixpkgs-origin/backport-127145-to-release-21.05.tar.gz | |
runc: use buildGoModuleorigin/backport-127145-to-release-21.05
(cherry picked from commit d152d3cc423f102b183c25d9f0aeb9eab414a9d8)
| -rw-r--r-- | pkgs/applications/virtualization/runc/default.nix | 7 |
1 files 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 |