summary refs log tree commit diff
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2023-01-01 12:14:11 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2023-01-08 13:30:27 +1000
commit4a8663e6d2b0c980ff29753a3ad70cdccea63236 (patch)
tree1e6f3af6d0452271c5800e6513a73817498edce3
parent1b761753701a97a053a2912cdbcb5775d1d62fcc (diff)
downloadnixpkgs-4a8663e6d2b0c980ff29753a3ad70cdccea63236.tar
nixpkgs-4a8663e6d2b0c980ff29753a3ad70cdccea63236.tar.gz
nixpkgs-4a8663e6d2b0c980ff29753a3ad70cdccea63236.tar.bz2
nixpkgs-4a8663e6d2b0c980ff29753a3ad70cdccea63236.tar.lz
nixpkgs-4a8663e6d2b0c980ff29753a3ad70cdccea63236.tar.xz
nixpkgs-4a8663e6d2b0c980ff29753a3ad70cdccea63236.tar.zst
nixpkgs-4a8663e6d2b0c980ff29753a3ad70cdccea63236.zip
cri-o: install cni and crictl files
-rw-r--r--pkgs/applications/virtualization/cri-o/default.nix3
-rw-r--r--pkgs/applications/virtualization/cri-o/wrapper.nix1
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 4f54b4044cd..7d197d30b93 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -54,6 +54,9 @@ buildGoModule rec {
       installShellCompletion --$shell completions/$shell/*
     done
 
+    install contrib/cni/*.conf -Dt $out/etc/cni/net.d
+    install crictl.yaml -Dt $out/etc
+
     installManPage docs/*.[1-9]
     runHook postInstall
   '';
diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix
index b220c8e29cb..5d15847d9c3 100644
--- a/pkgs/applications/virtualization/cri-o/wrapper.nix
+++ b/pkgs/applications/virtualization/cri-o/wrapper.nix
@@ -40,6 +40,7 @@ in runCommand cri-o-unwrapped.name {
   ln -s ${cri-o-unwrapped.man} $man
 
   mkdir -p $out/bin
+  ln -s ${cri-o-unwrapped}/etc $out/etc
   ln -s ${cri-o-unwrapped}/share $out/share
 
   for p in ${cri-o-unwrapped}/bin/*; do