git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #124921 from zowoq/podman-cni-conf
3600a82Robert Hensing
nixos/modules/virtualisation/podman.nix+2−2
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−{ config, lib, pkgs, utils, ... }:
1+{ config, lib, pkgs, ... }:
2let
2let
3 cfg = config.virtualisation.podman;
3 cfg = config.virtualisation.podman;
4 toml = pkgs.formats.toml { };
4 toml = pkgs.formats.toml { };
@@ -107,7 +107,7 @@ in
107 environment.systemPackages = [ cfg.package ]
107 environment.systemPackages = [ cfg.package ]
108 ++ lib.optional cfg.dockerCompat dockerCompat;
108 ++ lib.optional cfg.dockerCompat dockerCompat;
109
109
110− environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist";
110+ environment.etc."cni/net.d/87-podman-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist";
111
111
112 virtualisation.containers = {
112 virtualisation.containers = {
113 enable = true; # Enable common /etc/containers configuration
113 enable = true; # Enable common /etc/containers configuration
pkgs/applications/virtualization/podman/default.nix+1
@@ -69,6 +69,7 @@ buildGoModule rec {
69 installShellCompletion --zsh completions/zsh/*
69 installShellCompletion --zsh completions/zsh/*
70 MANDIR=$man/share/man make install.man-nobuild
70 MANDIR=$man/share/man make install.man-nobuild
71 '' + lib.optionalString stdenv.isLinux ''
71 '' + lib.optionalString stdenv.isLinux ''
72+ install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d
72 install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
73 install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
73 install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system
74 install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system
74 '' + ''
75 '' + ''
pkgs/applications/virtualization/podman/wrapper.nix+1
@@ -50,6 +50,7 @@ in runCommand podman.name {
50 ln -s ${podman.man} $man
50 ln -s ${podman.man} $man
51
51
52 mkdir -p $out/bin
52 mkdir -p $out/bin
53+ ln -s ${podman-unwrapped}/etc $out/etc
53 ln -s ${podman-unwrapped}/lib $out/lib
54 ln -s ${podman-unwrapped}/lib $out/lib
54 ln -s ${podman-unwrapped}/share $out/share
55 ln -s ${podman-unwrapped}/share $out/share
55 makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \
56 makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \