diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-09-05 22:10:48 +0100 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-09-05 22:33:40 +0100 |
| commit | 4bca8b48fbb9475a34820f5470623f18a45ddeed (patch) | |
| tree | 05ba1175a984c3acb8c3ff6a44dd3b461b04871d /pkgs | |
| parent | 416d11bb83a26231b28073d98755dba4ca36f847 (diff) | |
| download | nixlib-4bca8b48fbb9475a34820f5470623f18a45ddeed.tar nixlib-4bca8b48fbb9475a34820f5470623f18a45ddeed.tar.gz nixlib-4bca8b48fbb9475a34820f5470623f18a45ddeed.tar.bz2 nixlib-4bca8b48fbb9475a34820f5470623f18a45ddeed.tar.lz nixlib-4bca8b48fbb9475a34820f5470623f18a45ddeed.tar.xz nixlib-4bca8b48fbb9475a34820f5470623f18a45ddeed.tar.zst nixlib-4bca8b48fbb9475a34820f5470623f18a45ddeed.zip | |
notary: Build with go 1.12
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/notary/default.nix | 2 | ||||
| -rw-r--r-- | 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 17473b639881..f1a61adabbb6 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 055873e13ded..5c2343003881 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 { }; |