about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2020-05-13 22:11:32 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2020-05-14 23:07:57 +1000
commit399f5ea75edae655527781a62f6907974cd07625 (patch)
tree953193a8ee3447bb302ca5453ba1fd5ade6bed05 /pkgs/applications
parentb51a82932f9c978b94b164fa2e00ea39e465d554 (diff)
downloadnixlib-399f5ea75edae655527781a62f6907974cd07625.tar
nixlib-399f5ea75edae655527781a62f6907974cd07625.tar.gz
nixlib-399f5ea75edae655527781a62f6907974cd07625.tar.bz2
nixlib-399f5ea75edae655527781a62f6907974cd07625.tar.lz
nixlib-399f5ea75edae655527781a62f6907974cd07625.tar.xz
nixlib-399f5ea75edae655527781a62f6907974cd07625.tar.zst
nixlib-399f5ea75edae655527781a62f6907974cd07625.zip
cri-o: remove propagated inputs, update buildtags
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/virtualization/cri-o/default.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 14cac1533990..3796b8857b7f 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"