Merge pull request #68544 from peterhoeg/u/buildah

buildah: minor cleanups
This commit is contained in:
WilliButz 2019-09-12 13:29:35 +02:00 committed by GitHub
commit 3cf247cfa0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,31 +2,22 @@
, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
}:
let
buildGoPackage rec {
pname = "buildah";
version = "1.11.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "114dmjqacz5hairl1s8qhndzr52lcvh99g565cq5ydscblnzpw1b";
};
goPackagePath = "github.com/containers/buildah";
in buildGoPackage {
pname = "buildah";
inherit version;
inherit src;
outputs = [ "bin" "man" "out" ];
inherit goPackagePath;
goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ];
# Optimizations break compilation of libseccomp c bindings
hardeningDisable = [ "fortify" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
@ -40,10 +31,10 @@ in buildGoPackage {
make -C docs install PREFIX="$man"
'';
meta = {
meta = with stdenv.lib; {
description = "A tool which facilitates building OCI images";
homepage = https://github.com/containers/buildah;
maintainers = with stdenv.lib.maintainers; [ Profpatsch vdemeester ];
license = stdenv.lib.licenses.asl20;
homepage = "https://github.com/containers/buildah";
license = licenses.asl20;
maintainers = with maintainers; [ Profpatsch vdemeester ];
};
}