pyrox.dev / nixpkgs
lol
fork atom

buildah: wrap netavark via CONTAINERS_HELPER_BINARY_DIR

consistent with podman wrapper

zowoq cdbe7c69 ec58d408

+15
unified split
+15
pkgs/development/tools/buildah/wrapper.nix
··· 1 { buildah-unwrapped 2 , runCommand 3 , makeWrapper 4 , lib 5 , stdenv 6 , extraPackages ? [] ··· 11 , fuse-overlayfs # CoW for images, much faster than default vfs 12 , util-linux # nsenter 13 , iptables 14 }: 15 16 let ··· 25 iptables 26 ] ++ extraPackages); 27 28 in runCommand buildah-unwrapped.name { 29 name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}"; 30 inherit (buildah-unwrapped) pname version; ··· 48 mkdir -p $out/bin 49 ln -s ${buildah-unwrapped}/share $out/share 50 makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \ 51 --prefix PATH : ${binPath} 52 ''
··· 1 { buildah-unwrapped 2 , runCommand 3 , makeWrapper 4 + , symlinkJoin 5 , lib 6 , stdenv 7 , extraPackages ? [] ··· 12 , fuse-overlayfs # CoW for images, much faster than default vfs 13 , util-linux # nsenter 14 , iptables 15 + , aardvark-dns 16 + , netavark 17 }: 18 19 let ··· 28 iptables 29 ] ++ extraPackages); 30 31 + helpersBin = symlinkJoin { 32 + name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}"; 33 + 34 + # this only works for some binaries, others may need to be be added to `binPath` or in the modules 35 + paths = [ 36 + ] ++ lib.optionals stdenv.isLinux [ 37 + aardvark-dns 38 + netavark 39 + ]; 40 + }; 41 + 42 in runCommand buildah-unwrapped.name { 43 name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}"; 44 inherit (buildah-unwrapped) pname version; ··· 62 mkdir -p $out/bin 63 ln -s ${buildah-unwrapped}/share $out/share 64 makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \ 65 + --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ 66 --prefix PATH : ${binPath} 67 ''