diff options
| author | Peter Simons <simons@cryp.to> | 2016-08-29 16:54:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 16:54:36 +0200 |
| commit | 486c2048590899403b4cd3089f11056268c814f4 (patch) | |
| tree | 7a05f2bc0d5f9f6edfa0976b39aac56c1c56a791 | |
| parent | 8eaa645eca032f806d7ee4c3611d2d3a4ab7c303 (diff) | |
| parent | 9ddcd5d4568ce7201b35973632684c98d06aa362 (diff) | |
| download | nixpkgs-486c2048590899403b4cd3089f11056268c814f4.tar nixpkgs-486c2048590899403b4cd3089f11056268c814f4.tar.gz nixpkgs-486c2048590899403b4cd3089f11056268c814f4.tar.bz2 nixpkgs-486c2048590899403b4cd3089f11056268c814f4.tar.lz nixpkgs-486c2048590899403b4cd3089f11056268c814f4.tar.xz nixpkgs-486c2048590899403b4cd3089f11056268c814f4.tar.zst nixpkgs-486c2048590899403b4cd3089f11056268c814f4.zip | |
Merge pull request #18087 from YPares/stack-getlib
Haskell stack nix shell: using lib.getLib/Dev now
| -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; |