public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66475 from kirelagin/stack-native-build-inputs

Browse Source 
haskell.buildStackProject: Pass nativeBuildInputs
This commit is contained in:
Matthew Bauer 2019-08-13 11:45:19 -04:00 committed by GitHub
commit 8a95dfd829
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/generic-stack-builder.nix
View File

@ -2,6 +2,7 @@
, cacert, stack, makeSetupHook, lib }@depArgs: , cacert, stack, makeSetupHook, lib }@depArgs:
{ buildInputs ? [] { buildInputs ? []
, nativeBuildInputs ? []
, extraArgs ? [] , extraArgs ? []
, LD_LIBRARY_PATH ? [] , LD_LIBRARY_PATH ? []
, ghc ? depArgs.ghc , ghc ? depArgs.ghc
@ -22,7 +23,8 @@ in stdenv.mkDerivation (args // {
buildInputs = buildInputs buildInputs = buildInputs
++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales;
nativeBuildInputs = [ ghc pkgconfig stack stackHook ]; nativeBuildInputs = nativeBuildInputs
++ [ ghc pkgconfig stack stackHook ];
STACK_PLATFORM_VARIANT = "nix"; STACK_PLATFORM_VARIANT = "nix";
STACK_IN_NIX_SHELL = 1; STACK_IN_NIX_SHELL = 1;