Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dc1d9a578d45
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b5035c089295
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 22, 2020

  1. cri-o: Fix build tags usage 

    Signed-off-by: Sascha Grunert <sgrunert@suse.com>
    @saschagrunert @ehmry
    saschagrunert authored and ehmry committed Jan 22, 2020
    Copy the full SHA
    b5035c0 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/applications/virtualization/cri-o/default.nix
5 changes: 2 additions & 3 deletions pkgs/applications/virtualization/cri-o/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,8 +16,7 @@
}:

let
makeFlags = "BUILDTAGS=\"apparmor seccomp selinux
containers_image_ostree_stub\"";
buildTags = "apparmor seccomp selinux containers_image_ostree_stub";
in buildGoPackage rec {
project = "cri-o";
version = "1.16.1";
@@ -47,7 +46,7 @@ in buildGoPackage rec {
# Build the crio binaries
function build() {
go build \
-tags ${makeFlags} \
-tags "${buildTags}" \
-o bin/"$1" \
-buildmode=pie \
-ldflags '-s -w ${ldflags}' \