diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-08-13 11:45:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 11:45:19 -0400 |
| commit | 8a95dfd829cdcd83c4fbd5046e354d84db3f6738 (patch) | |
| tree | e4337348a7952a4c55218bb94a50f88c687c42fa | |
| parent | 65bf9f4aa53ceb693d97160500fece9185e61b2e (diff) | |
| parent | 18a95439ec26f05b914f87b826bfd8366aa72436 (diff) | |
| download | nixlib-8a95dfd829cdcd83c4fbd5046e354d84db3f6738.tar nixlib-8a95dfd829cdcd83c4fbd5046e354d84db3f6738.tar.gz nixlib-8a95dfd829cdcd83c4fbd5046e354d84db3f6738.tar.bz2 nixlib-8a95dfd829cdcd83c4fbd5046e354d84db3f6738.tar.lz nixlib-8a95dfd829cdcd83c4fbd5046e354d84db3f6738.tar.xz nixlib-8a95dfd829cdcd83c4fbd5046e354d84db3f6738.tar.zst nixlib-8a95dfd829cdcd83c4fbd5046e354d84db3f6738.zip | |
Merge pull request #66475 from kirelagin/stack-native-build-inputs
haskell.buildStackProject: Pass nativeBuildInputs
| -rw-r--r-- | pkgs/development/haskell-modules/generic-stack-builder.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 184d45eda445..96774f71730f 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -2,6 +2,7 @@ , cacert, stack, makeSetupHook, lib }@depArgs: { buildInputs ? [] +, nativeBuildInputs ? [] , extraArgs ? [] , LD_LIBRARY_PATH ? [] , ghc ? depArgs.ghc @@ -22,7 +23,8 @@ in stdenv.mkDerivation (args // { buildInputs = buildInputs ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; - nativeBuildInputs = [ ghc pkgconfig stack stackHook ]; + nativeBuildInputs = nativeBuildInputs + ++ [ ghc pkgconfig stack stackHook ]; STACK_PLATFORM_VARIANT = "nix"; STACK_IN_NIX_SHELL = 1; |