public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85526 from zowoq/misc

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/virtualization/conmon/default.nix
View File

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

17
pkgs/development/tools/buildah/default.nix
View File

@ -1,5 +1,14 @@
{ stdenv, buildGoPackage, fetchFromGitHub { stdenv
, gpgme, libgpgerror, lvm2, btrfs-progs, pkg-config, libselinux, libseccomp , buildGoPackage
, fetchFromGitHub
, installShellFiles
, pkg-config
, gpgme
, libgpgerror
, lvm2
, btrfs-progs
, libselinux
, libseccomp
}: }:
buildGoPackage rec { buildGoPackage rec {
@ -18,7 +27,7 @@ buildGoPackage rec {
goPackagePath = "github.com/containers/buildah"; goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ]; excludedPackages = [ "tests" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ];
patches = [ ./disable-go-module-mode.patch ]; patches = [ ./disable-go-module-mode.patch ];
@ -27,7 +36,7 @@ buildGoPackage rec {
pushd go/src/${goPackagePath} pushd go/src/${goPackagePath}
make GIT_COMMIT="unknown" make GIT_COMMIT="unknown"
install -Dm755 buildah $bin/bin/buildah 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 = '' postBuild = ''