From 03e32b7093afd6afd1cd63c54ae522328e453354 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 17 Aug 2022 01:10:56 +0800 Subject: [PATCH] buildah: support build for darwin --- pkgs/development/tools/buildah/default.nix | 5 +++-- pkgs/development/tools/buildah/wrapper.nix | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index d0c630ab488e..bacbdcffc15e 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , go-md2man @@ -32,8 +33,9 @@ buildGoModule rec { nativeBuildInputs = [ go-md2man installShellFiles pkg-config ]; buildInputs = [ - btrfs-progs gpgme + ] ++ lib.optionals stdenv.isLinux [ + btrfs-progs libapparmor libseccomp libselinux @@ -62,6 +64,5 @@ buildGoModule rec { changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; - platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index a31dece7df5e..66cb060a8180 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -2,6 +2,7 @@ , runCommand , makeWrapper , lib +, stdenv , extraPackages ? [] , buildah , runc # Default container runtime @@ -20,6 +21,7 @@ let preferLocalBuild = true; binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ runc crun conmon