Haskell stack nix shell: using lib.getLib/Dev now
This commit is contained in:
parent
898edb0fbc
commit
9ddcd5d456
@ -19,12 +19,13 @@ 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 =
|
STACK_IN_NIX_EXTRA_ARGS =
|
||||||
concatMap (pkg: ["--extra-lib-dirs=${pkg}/lib"
|
concatMap (pkg: ["--extra-lib-dirs=${getLib pkg}/lib"
|
||||||
"--extra-include-dirs=${pkg}/include"]) buildInputs ++
|
"--extra-include-dirs=${getDev pkg}/include"]) buildInputs ++
|
||||||
extraArgs;
|
extraArgs;
|
||||||
|
|
||||||
# XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
|
# XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
|
||||||
LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);
|
LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);
|
||||||
|
# ^^^ Internally uses `getOutput "lib"` (equiv. to getLib)
|
||||||
|
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user