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

generic-stack-builder: also support nix-build

Browse Source 
We need to add the STACK_IN_NIX_EXTRA_ARGS hook in configurePhase also to ensure we get the right args when calling ```nix-build``` (as opposed to nix-shell).
This commit is contained in:
Matthew Justin Bauer 2018-05-09 18:12:13 -05:00 committed by GitHub
parent 12ee278a0d
commit 1682353805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,18 @@ with stdenv.lib;
}@args: }@args:
let stackCmd = "stack --internal-re-exec-version=${stack.version}"; let stackCmd = "stack --internal-re-exec-version=${stack.version}";
# Add all dependencies in buildInputs including propagated ones to
# STACK_IN_NIX_EXTRA_ARGS.
addStackArgsHook = ''
for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
do
[ -d "$pkg/lib" ] && \
export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
[ -d "$pkg/include" ] && \
export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
done
'';
in stdenv.mkDerivation (args // { in stdenv.mkDerivation (args // {
buildInputs = buildInputs =
@ -21,15 +33,7 @@ in stdenv.mkDerivation (args // {
STACK_PLATFORM_VARIANT="nix"; STACK_PLATFORM_VARIANT="nix";
STACK_IN_NIX_SHELL=1; STACK_IN_NIX_SHELL=1;
STACK_IN_NIX_EXTRA_ARGS = extraArgs; STACK_IN_NIX_EXTRA_ARGS = extraArgs;
shellHook = '' shellHook = addStackArgsHook;
for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
do
[ -d "$pkg/lib" ] && \
export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
[ -d "$pkg/include" ] && \
export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
done
'';
# XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042. # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
@ -46,6 +50,7 @@ in stdenv.mkDerivation (args // {
configurePhase = args.configurePhase or '' configurePhase = args.configurePhase or ''
export STACK_ROOT=$NIX_BUILD_TOP/.stack export STACK_ROOT=$NIX_BUILD_TOP/.stack
${addStackArgsHook}
''; '';
buildPhase = args.buildPhase or "${stackCmd} build"; buildPhase = args.buildPhase or "${stackCmd} build";