diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:16 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:25 +0200 |
| commit | 92a26320e7b9bbfe781e222a17c518443f63316a (patch) | |
| tree | db6e4fe7706ec8c065d7efe10e93b38ea1b149ba /pkgs/applications/virtualization/cri-o/default.nix | |
| parent | 2006fd4fc5a20c72ab2166b2b4039307f4f54bcb (diff) | |
| parent | 85a05878846b75254f97b8690c18a470cfe982f0 (diff) | |
| download | nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.gz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.bz2 nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.lz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.xz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.zst nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/virtualization/cri-o/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/cri-o/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 4c3d9ffc937c..0851f1f716be 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -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/* |