JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #86378 from saschagrunert/crio-buildgomodule

Browse Source 
cri-o: switch to buildGoModule
This commit is contained in:
Mario Rodas 2020-05-14 08:01:03 -05:00 committed by GitHub
commit 2c8312402d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/virtualization/cri-o/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv
, btrfs-progs
, buildGoPackage
, buildGoModule
, fetchFromGitHub
, glibc
, gpgme
@ -14,21 +14,18 @@
, pkg-config
}:
buildGoPackage rec {
buildGoModule rec {
pname = "cri-o";
version = "1.18.0";
goPackagePath = "github.com/cri-o/cri-o";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah";
};
vendorSha256 = null;
outputs = [ "out" "man" ];
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [
@ -44,8 +41,6 @@ buildGoPackage rec {
BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub";
buildPhase = ''
pushd go/src/${goPackagePath}
sed -i '/version.buildDate/d' Makefile
make binaries docs BUILDTAGS="$BUILDTAGS"