From f92387242edeb00d0c14094cad096b0e224832d2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 12 May 2020 05:27:58 +1000 Subject: [PATCH] buildah: cleanup, restrict to linux --- pkgs/development/tools/buildah/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 09d1e16a8b0..32380e04c90 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -25,7 +25,6 @@ buildGoPackage rec { outputs = [ "out" "man" ]; goPackagePath = "github.com/containers/buildah"; - excludedPackages = [ "tests" ]; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; @@ -35,11 +34,12 @@ buildGoPackage rec { buildPhase = '' pushd go/src/${goPackagePath} make GIT_COMMIT="unknown" - install -Dm755 buildah $out/bin/buildah - installShellCompletion --bash contrib/completions/bash/buildah + make -C docs ''; - postBuild = '' + installPhase = '' + install -Dm755 buildah $out/bin/buildah + installShellCompletion --bash contrib/completions/bash/buildah make -C docs install PREFIX="$man" ''; @@ -49,5 +49,6 @@ buildGoPackage rec { changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; + platforms = platforms.linux; }; }