diff options
| author | Jude Taylor <me@jude.bio> | 2017-10-31 15:10:47 -0700 |
|---|---|---|
| committer | Domen Kožar <domen@enlambda.com> | 2017-11-01 12:16:48 +0100 |
| commit | 737b4660311bd691200ebe1d422a8ff4958ad676 (patch) | |
| tree | 3a9b8a2da18e685122ce11b467c3dc50b261c244 /pkgs/development/haskell-modules | |
| parent | 8a59ef7354cb1ff66bbf815312946faab9b4a3b2 (diff) | |
| download | nixlib-737b4660311bd691200ebe1d422a8ff4958ad676.tar nixlib-737b4660311bd691200ebe1d422a8ff4958ad676.tar.gz nixlib-737b4660311bd691200ebe1d422a8ff4958ad676.tar.bz2 nixlib-737b4660311bd691200ebe1d422a8ff4958ad676.tar.lz nixlib-737b4660311bd691200ebe1d422a8ff4958ad676.tar.xz nixlib-737b4660311bd691200ebe1d422a8ff4958ad676.tar.zst nixlib-737b4660311bd691200ebe1d422a8ff4958ad676.zip | |
fix ghcjs socket.io
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5d8a28f5c2b0..3e82003be43c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -362,8 +362,7 @@ stdenv.mkDerivation ({ env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; - nativeBuildInputs = [ ghcEnv systemBuildInputs ] - ++ optional isGhcjs ghc."socket.io"; # for ghcjsi + nativeBuildInputs = [ ghcEnv systemBuildInputs ]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ec7d961581a4..ac484b3c1124 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -74,6 +74,9 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \ --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \ --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" \ + ${lib.optionalString (ghc.isGhcjs or false) + ''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"'' + } \ ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} fi done |