From 072cdcb265123b40e507c427ba99f907929c6f79 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Dec 2019 04:20:00 -0500 Subject: [PATCH 1/2] podman: enable on darwin --- pkgs/applications/virtualization/podman/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 607d790247f..75bc85b745a 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -20,12 +20,14 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig go-md2man installShellFiles ]; - buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ]; buildPhase = '' - pushd $NIX_BUILD_TOP/go/src/${goPackagePath} + pushd go/src/${goPackagePath} patchShebangs . - make binaries docs + ${if stdenv.isDarwin + then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" + else "make binaries docs"} ''; installPhase = '' @@ -40,6 +42,6 @@ buildGoPackage rec { description = "A program for managing pods, containers and container images"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester saschagrunert ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From d712be5f3edbf84f1dc23124e3db1a8840307921 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Dec 2019 04:21:00 -0500 Subject: [PATCH 2/2] podman: add marsam to maintainers --- pkgs/applications/virtualization/podman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 75bc85b745a..dbd05e38d3f 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -41,7 +41,7 @@ buildGoPackage rec { homepage = https://podman.io/; description = "A program for managing pods, containers and container images"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester saschagrunert ]; + maintainers = with maintainers; [ vdemeester saschagrunert marsam ]; platforms = platforms.unix; }; }