commit 73d2ab700307e65558f661d0eff528a8988414ab
parent 90396b7de4f4e1fa0dab293ea8201d3dc50c2233
Author: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 2 Nov 2018 11:01:10 +0100
pkgs: add slirp4netns and use it in programs.podman
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
4 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/modules/programs/podman.nix b/modules/programs/podman.nix
@@ -16,6 +16,7 @@ in
};
config = mkIf cfg.enable {
# FIXME(vdemeester) package podman and conmon in nixpkgs
+ home.packages = with pkgs; [ slirp4netns ];
xdg.configFile."containers/libpod.conf".text = ''
image_default_transport = "docker://"
runtime_path = ["/run/current-system/sw/bin/runc"]
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -39,6 +39,9 @@ self: super:
s2i= import ../pkgs/s2i {
inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
};
+ slirp4netns = import ./pkgs/slirp4netns {
+ inherit (self) stdenv lib fetchFromGitHub automake autoconf gcc;
+ };
skaffold = import ../pkgs/skaffold {
inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
};
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -42,6 +42,9 @@ in rec {
skaffold = import ./skaffold {
inherit (pkgs) stdenv lib buildGoPackage fetchFromGitHub;
};
+ slirp4netns = import ./slirp4netns {
+ inherit (pkgs) stdenv lib fetchFromGitHub automake autoconf gcc;
+ };
s2i = import ./s2i {
inherit (pkgs) stdenv lib buildGoPackage fetchFromGitHub;
};
diff --git a/pkgs/slirp4netns/default.nix b/pkgs/slirp4netns/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, lib, fetchFromGitHub, automake, autoconf, gcc }:
+
+stdenv.mkDerivation rec {
+ name = "slirp4netns-${version}";
+ version = "unstable-2018-11-01";
+ rev = "01f874a15ba08878b72a8bf8ddb8b9817f9dc1d9";
+
+ src = fetchFromGitHub {
+ owner = "rootless-containers";
+ repo = "slirp4netns";
+ sha256 = "1czwkqavrzmknyc9qzr8ck6hmdjpks3zb2wy5i2hxzhrjs8g0m83";
+ inherit rev;
+ };
+
+ buildInputs = [
+ automake autoconf gcc
+ ];
+
+ preConfigure = "./autogen.sh";
+}