summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-02-09 19:47:39 +0100
committerPeter Simons <simons@cryp.to>2018-02-09 19:56:20 +0100
commitbd3379c4434334bd5bccc2fb91ac64a02ca77fb1 (patch)
treea3e835cd9ff75a055f4a415d38cba85f105582f1
parente44d763b1d89797bbb73772951adee1e25795afd (diff)
downloadnixlib-bd3379c4434334bd5bccc2fb91ac64a02ca77fb1.tar
nixlib-bd3379c4434334bd5bccc2fb91ac64a02ca77fb1.tar.gz
nixlib-bd3379c4434334bd5bccc2fb91ac64a02ca77fb1.tar.bz2
nixlib-bd3379c4434334bd5bccc2fb91ac64a02ca77fb1.tar.lz
nixlib-bd3379c4434334bd5bccc2fb91ac64a02ca77fb1.tar.xz
nixlib-bd3379c4434334bd5bccc2fb91ac64a02ca77fb1.tar.zst
nixlib-bd3379c4434334bd5bccc2fb91ac64a02ca77fb1.zip
haskell-generic-builder: include build-tool dependencies in shell environments
For a Haskell package "foo" the environment foo.env now contains the build tool
dependencies required for compiling the package in $PATH.

Fixes https://github.com/NixOS/cabal2nix/issues/331.
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index eb66a6f89223..de37a8e92441 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -384,7 +384,7 @@ stdenv.mkDerivation ({
     env = stdenv.mkDerivation {
       name = "interactive-${pname}-${version}-environment";
       buildInputs = systemBuildInputs;
-      nativeBuildInputs = [ ghcEnv ];
+      nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs;
       LANG = "en_US.UTF-8";
       LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
       shellHook = ''