diff options
| author | YPares <yves.pares@gmail.com> | 2016-08-29 16:15:09 +0200 |
|---|---|---|
| committer | YPares <yves.pares@gmail.com> | 2016-08-29 16:15:09 +0200 |
| commit | 9ddcd5d4568ce7201b35973632684c98d06aa362 (patch) | |
| tree | d48c1f3fdbef39e340f2b2b721532f5beda3f9b9 /pkgs/development/haskell-modules/generic-stack-builder.nix | |
| parent | 898edb0fbc3f23b24b7e28bad0cdd3e57ad5dcc7 (diff) | |
| download | nixpkgs-9ddcd5d4568ce7201b35973632684c98d06aa362.tar nixpkgs-9ddcd5d4568ce7201b35973632684c98d06aa362.tar.gz nixpkgs-9ddcd5d4568ce7201b35973632684c98d06aa362.tar.bz2 nixpkgs-9ddcd5d4568ce7201b35973632684c98d06aa362.tar.lz nixpkgs-9ddcd5d4568ce7201b35973632684c98d06aa362.tar.xz nixpkgs-9ddcd5d4568ce7201b35973632684c98d06aa362.tar.zst nixpkgs-9ddcd5d4568ce7201b35973632684c98d06aa362.zip | |
Haskell stack nix shell: using lib.getLib/Dev now
Diffstat (limited to 'pkgs/development/haskell-modules/generic-stack-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-stack-builder.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 09bd38ccc93..c7cfbef7d13 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -19,12 +19,13 @@ stdenv.mkDerivation (args // { STACK_PLATFORM_VARIANT="nix"; STACK_IN_NIX_SHELL=1; STACK_IN_NIX_EXTRA_ARGS = - concatMap (pkg: ["--extra-lib-dirs=${pkg}/lib" - "--extra-include-dirs=${pkg}/include"]) buildInputs ++ + concatMap (pkg: ["--extra-lib-dirs=${getLib pkg}/lib" + "--extra-include-dirs=${getDev pkg}/include"]) buildInputs ++ extraArgs; # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042. LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs); + # ^^^ Internally uses `getOutput "lib"` (equiv. to getLib) preferLocalBuild = true; |