Merge pull request #85526 from zowoq/misc

buildah, conmon: misc fixes
This commit is contained in:
Mario Rodas 2020-04-19 19:26:41 -05:00 committed by GitHub
commit c3945dc31c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 10 deletions

View file

@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib systemd ] ++
stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
buildInputs = [ glib systemd ]
++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}";
installFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = "https://github.com/containers/conmon";

View file

@ -1,5 +1,14 @@
{ stdenv, buildGoPackage, fetchFromGitHub
, gpgme, libgpgerror, lvm2, btrfs-progs, pkg-config, libselinux, libseccomp
{ stdenv
, buildGoPackage
, fetchFromGitHub
, installShellFiles
, pkg-config
, gpgme
, libgpgerror
, lvm2
, btrfs-progs
, libselinux
, libseccomp
}:
buildGoPackage rec {
@ -7,9 +16,9 @@ buildGoPackage rec {
version = "1.14.8";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q";
};
@ -18,7 +27,7 @@ buildGoPackage rec {
goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ];
patches = [ ./disable-go-module-mode.patch ];
@ -27,7 +36,7 @@ buildGoPackage rec {
pushd go/src/${goPackagePath}
make GIT_COMMIT="unknown"
install -Dm755 buildah $bin/bin/buildah
install -Dm444 contrib/completions/bash/buildah $bin/share/bash-completion/completions/buildah
installShellCompletion --bash contrib/completions/bash/buildah
'';
postBuild = ''