pond: fix build by renaming imports, also add renameImports to goBuildPackage

1 files changed, 11 insertions, 3 deletions

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 8fed5a55be06..76828784a9d5 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go }:
+{ go, govers, lib }:
 
 { name, buildInputs ? []
 
@@ -9,7 +9,7 @@
 
 go.stdenv.mkDerivation ( args // {
   name = "go${go.meta.branch}-${name}";
-  buildInputs = [ go ] ++ buildInputs;
+  buildInputs = [ go ] ++ buildInputs ++ (lib.optional (args ? renameImports) govers) ;
 
   configurePhase = args.configurePhase or ''
     runHook preConfigure
@@ -23,9 +23,16 @@ go.stdenv.mkDerivation ( args // {
     runHook postConfigure
   '';
 
+  renameImports = lib.optionalString (args ? renameImports)
+                    (lib.concatMapStringsSep "\n"
+                      (cmdargs: "govers -m ${cmdargs}")
+                      args.renameImports);
+
   buildPhase = args.buildPhase or ''
     runHook preBuild
 
+    runHook renameImports
+
     if [ -n "$subPackages" ] ; then
 	for p in $subPackages ; do
             go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p
@@ -83,6 +90,7 @@ go.stdenv.mkDerivation ( args // {
 
   meta = meta // {
     # add an extra maintainer to every package
-    maintainers = (meta.maintainers or []) ++ [ go.stdenv.lib.maintainers.emery ];
+    maintainers = (meta.maintainers or []) ++
+                  [ lib.maintainers.emery lib.maintainers.lethalman ];
   };
 })