From e5096a5041e12cf673390d50bb7fd532f674e755 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 22 Aug 2021 14:29:06 +1000 Subject: [PATCH] containerd: move version/revision into buildPhase --- pkgs/applications/virtualization/containerd/1.4.nix | 4 +--- pkgs/applications/virtualization/containerd/default.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/1.4.nix b/pkgs/applications/virtualization/containerd/1.4.nix index e4f743013b27..9e62f86a3477 100644 --- a/pkgs/applications/virtualization/containerd/1.4.nix +++ b/pkgs/applications/virtualization/containerd/1.4.nix @@ -26,12 +26,10 @@ buildGoPackage rec { buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - make binaries man $buildFlags + make binaries man "VERSION=v${version}" "REVISION=${src.rev}" ''; installPhase = '' diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index c86f4280e821..cce72e2a745f 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -27,14 +27,12 @@ buildGoModule rec { buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ]; buildPhase = '' runHook preBuild patchShebangs . - make binaries man $buildFlags + make binaries man "VERSION=v${version}" "REVISION=${src.rev}" runHook postBuild '';