nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

mirrorbits: Fix build with go 1.12

Browse Source 
(cherry picked from commit b0326145da)
This commit is contained in:
adisbladis
2019-09-05 22:24:31 +01:00
parent 4f33008ec0
commit 95d7c8df45
2 changed files with 6 additions and 5 deletions
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
'';
# 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;

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

@@ -4789,11 +4789,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 { };