diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-18 19:02:15 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-18 20:17:06 -0400 |
| commit | 34f57ac837349e9c1080f456098af53a1244c933 (patch) | |
| tree | 01124cea01cba783236a03459096089a42cd9ef5 /pkgs/development/haskell-modules | |
| parent | 1f8f89d309eeebfe00b25c30cc9dca103f3d8b47 (diff) | |
| download | nixlib-34f57ac837349e9c1080f456098af53a1244c933.tar nixlib-34f57ac837349e9c1080f456098af53a1244c933.tar.gz nixlib-34f57ac837349e9c1080f456098af53a1244c933.tar.bz2 nixlib-34f57ac837349e9c1080f456098af53a1244c933.tar.lz nixlib-34f57ac837349e9c1080f456098af53a1244c933.tar.xz nixlib-34f57ac837349e9c1080f456098af53a1244c933.tar.zst nixlib-34f57ac837349e9c1080f456098af53a1244c933.zip | |
haskell: fix with-packages-wrapper in ghcjs
Fixes #42032 Fixes #42070
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 03f0a1dd0a3e..7fda1d84e55b 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -38,7 +38,7 @@ let ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; - libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}"; + libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else if isGhcjs then "$out/libexec" else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); |