summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-05-18 15:27:33 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-05-18 19:45:18 -0700
commitc2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1 (patch)
tree66e57f04c30da88d1a85d3fbca2e8389dfd1e4a0
parent85c48934bcba36a7531db1c657781ff2d64967d5 (diff)
downloadnixpkgs-c2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1.tar
nixpkgs-c2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1.tar.gz
nixpkgs-c2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1.tar.bz2
nixpkgs-c2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1.tar.lz
nixpkgs-c2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1.tar.xz
nixpkgs-c2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1.tar.zst
nixpkgs-c2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1.zip
buildGoPackage: Take into account propagatedBuildInputs during rename
-rw-r--r--pkgs/development/go-modules/generic/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 2b4d59ca7fb..34cf65b844d 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -54,8 +54,9 @@ go.stdenv.mkDerivation (
 
   renameImports = args.renameImports or (
     let
-      inputsWithAliases = lib.filter (x: x ? goPackageAliases) buildInputs;
-      rename = to: from: "echo Renaming '${from}' to '${to}'; govers -m ${from} ${to}";
+      inputsWithAliases = lib.filter (x: x ? goPackageAliases)
+        (buildInputs ++ (args.propagatedBuildInputs or [ ]));
+      rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}";
       renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases;
     in lib.concatMapStringsSep "\n" renames inputsWithAliases);