cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

buildah: support build for darwin

Browse source
This commit is contained in:
Jiajie Chen 2022-08-17 01:10:56 +08:00 committed by zowoq
parent 04c142749c
commit 03e32b7093
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/tools/buildah/default.nix
View file

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, go-md2man , go-md2man
@ -32,8 +33,9 @@ buildGoModule rec {
nativeBuildInputs = [ go-md2man installShellFiles pkg-config ]; nativeBuildInputs = [ go-md2man installShellFiles pkg-config ];
buildInputs = [ buildInputs = [
btrfs-progs
gpgme gpgme
] ++ lib.optionals stdenv.isLinux [
btrfs-progs
libapparmor libapparmor
libseccomp libseccomp
libselinux libselinux
@ -62,6 +64,5 @@ buildGoModule rec {
changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members;
platforms = platforms.linux;
}; };
} }

2
pkgs/development/tools/buildah/wrapper.nix
View file

@ -2,6 +2,7 @@
, runCommand , runCommand
, makeWrapper , makeWrapper
, lib , lib
, stdenv
, extraPackages ? [] , extraPackages ? []
, buildah , buildah
, runc # Default container runtime , runc # Default container runtime
@ -20,6 +21,7 @@ let
preferLocalBuild = true; preferLocalBuild = true;
binPath = lib.makeBinPath ([ binPath = lib.makeBinPath ([
] ++ lib.optionals stdenv.isLinux [
runc runc
crun crun
conmon conmon