Merge pull request #87660 from zowoq/crio-flavor

cri-o: drop flavor
This commit is contained in:
Mario Rodas 2020-05-13 06:57:41 -05:00 committed by GitHub
commit 8ec4b8b98b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,4 @@
{ flavor ? ""
, stdenv
{ stdenv
, btrfs-progs
, buildGoPackage
, fetchFromGitHub
@ -18,7 +17,6 @@
buildGoPackage rec {
pname = "cri-o";
version = "1.18.0";
name = "${pname}-${version}${flavor}";
goPackagePath = "github.com/cri-o/cri-o";
@ -54,9 +52,7 @@ buildGoPackage rec {
'';
installPhase = ''
install -Dm755 bin/crio $out/bin/crio${flavor}
install -Dm755 bin/crio-status $out/bin/crio-status${flavor}
install -Dm755 bin/pinns $out/bin/pinns${flavor}
install -Dm755 bin/* -t $out/bin
for shell in bash fish zsh; do
installShellCompletion --$shell completions/$shell/*