From b0326145da9697821bc16bf0d8c758f2699ad66a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 5 Sep 2019 22:24:31 +0100 Subject: mirrorbits: Fix build with go 1.12 --- pkgs/servers/mirrorbits/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 48817f76bda..0761468bd1f 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -24,6 +24,11 @@ buildGoPackage rec { rm -rf testing ''; + # Fix build with go >=1.12 + preBuild = '' + sed -i s/"_Ctype_struct_GeoIPRecordTag"/"C.struct_GeoIPRecordTag"/ ./go/src/github.com/etix/geoip/geoip.go + ''; + goPackagePath = "github.com/etix/mirrorbits"; goDeps = ./deps.nix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9af01e631a..827b185adec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4798,11 +4798,7 @@ in miredo = callPackage ../tools/networking/miredo { }; - mirrorbits = callPackage ../servers/mirrorbits { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + mirrorbits = callPackage ../servers/mirrorbits { }; mitmproxy = callPackage ../tools/networking/mitmproxy { }; -- cgit 1.4.1