From 4bca8b48fbb9475a34820f5470623f18a45ddeed Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 5 Sep 2019 22:10:48 +0100 Subject: [PATCH] notary: Build with go 1.12 --- pkgs/tools/security/notary/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 17473b63988..f1a61adabbb 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { buildPhase = '' runHook preBuild cd go/src/github.com/theupdateframework/notary - make client GITCOMMIT=${gitcommit} + SKIPENVCHECK=1 make client GITCOMMIT=${gitcommit} runHook postBuild ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 055873e13de..5c234300388 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5111,9 +5111,7 @@ in nnn = callPackage ../applications/misc/nnn { }; - notary = callPackage ../tools/security/notary { - buildGoPackage = buildGo110Package; - }; + notary = callPackage ../tools/security/notary { }; notify-osd = callPackage ../applications/misc/notify-osd { };