From 399f5ea75edae655527781a62f6907974cd07625 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 22:11:32 +1000 Subject: [PATCH] cri-o: remove propagated inputs, update buildtags --- pkgs/applications/virtualization/cri-o/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 14cac153399..3796b8857b7 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -6,8 +6,6 @@ , gpgme , installShellFiles , libapparmor -, libassuan -, libgpgerror , libseccomp , libselinux , lvm2 @@ -32,15 +30,15 @@ buildGoModule rec { btrfs-progs gpgme libapparmor - libassuan - libgpgerror libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; - BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; + BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' + patchShebangs . + sed -i '/version.buildDate/d' Makefile make binaries docs BUILDTAGS="$BUILDTAGS"