From db131371efa84d0b7055536d9d5335c0a97e0af8 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 26 Aug 2019 22:50:16 +0200 Subject: [PATCH] minio-client: remove go 1.10 override --- pkgs/tools/networking/minio-client/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index ebd6e7c57993..3c8d15346849 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,7 +2,6 @@ buildGoPackage rec { pname = "minio-client"; - version = "2019-01-30T19-57-22Z"; src = fetchFromGitHub { @@ -14,9 +13,9 @@ buildGoPackage rec { goPackagePath = "github.com/minio/mc"; - buildFlagsArray = [''-ldflags= - -X github.com/minio/mc/cmd.Version=${version} - '']; + preBuild = '' + buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}") + ''; meta = with stdenv.lib; { homepage = https://github.com/minio/mc; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c62a1822f240..23f7fe8dce0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4777,9 +4777,7 @@ in minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { - buildGoPackage = buildGo110Package; - }; + minio-client = callPackage ../tools/networking/minio-client { }; minissdpd = callPackage ../tools/networking/minissdpd { };