about summary refs log tree commit diff
path: root/pkgs/development/go-modules/generic
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-07-26 16:18:53 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-07-26 16:18:53 +0200
commitf59e6f4037a741d41bee04e9b1ee684aae956d86 (patch)
tree7a4d525b632c96a333c4deb4550b77e518cdc1f9 /pkgs/development/go-modules/generic
parent38ac3b34373f1eb75ce85edca60f22ee6a2bcd85 (diff)
parent812f4749ae76262490e5e3984f8676953da1f5dc (diff)
downloadnixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.gz
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.bz2
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.lz
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.xz
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.zst
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.zip
Merge master into staging
Diffstat (limited to 'pkgs/development/go-modules/generic')
-rw-r--r--pkgs/development/go-modules/generic/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 621ab1f18f9f..9b6f80e0f837 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -2,6 +2,7 @@
 , removeReferencesTo, fetchFromGitHub }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
+, shellHook ? ""
 
 # We want parallel builds by default
 , enableParallelBuilding ? true
@@ -202,7 +203,7 @@ go.stdenv.mkDerivation (
   ''
   ) goPath) + ''
     export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
-  '';
+  '' + shellHook;
 
   disallowedReferences = lib.optional (!allowGoReference) go
     ++ lib.optional (!dontRenameImports) govers;