JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mirrorbits: Fix build with go 1.12

Browse Source
This commit is contained in:
adisbladis 2019-09-05 22:24:31 +01:00
parent 0fda5eff8e
commit b0326145da
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/mirrorbits/default.nix
View File

@ -24,6 +24,11 @@ buildGoPackage rec {
rm -rf testing 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"; goPackagePath = "github.com/etix/mirrorbits";
goDeps = ./deps.nix; goDeps = ./deps.nix;

6
pkgs/top-level/all-packages.nix
View File

@ -4798,11 +4798,7 @@ in
miredo = callPackage ../tools/networking/miredo { }; miredo = callPackage ../tools/networking/miredo { };
mirrorbits = callPackage ../servers/mirrorbits { 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;
};
mitmproxy = callPackage ../tools/networking/mitmproxy { }; mitmproxy = callPackage ../tools/networking/mitmproxy { };