public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghcjs: get socket.io from pkgsHostHost 

This is a bit dubvious, but the alternative of making nodejs a
nativeBuildInput for node packages is worse. In general the cross story
for interpreted languages is murky, and this fits that pattern.
This commit is contained in:
John Ericson 2019-12-24 19:49:48 -05:00
parent ad93663a48
commit c3c245dcda
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/ghcjs-ng/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv { stdenv
, pkgsHostHost
, callPackage , callPackage
, fetchgit , fetchgit
, ghcjsSrcJson ? null , ghcjsSrcJson ? null
@ -14,7 +15,6 @@
, pkgconfig , pkgconfig
, gcc , gcc
, lib , lib
, nodePackages
, ghcjsDepOverrides ? (_:_:{}) , ghcjsDepOverrides ? (_:_:{})
, haskell , haskell
}: }:
@ -47,7 +47,7 @@ let
enableShared = true; enableShared = true;
socket-io = nodePackages."socket.io"; socket-io = pkgsHostHost.nodePackages."socket.io";
# Relics of the old GHCJS build system # Relics of the old GHCJS build system
stage1Packages = []; stage1Packages = [];

4
pkgs/development/compilers/ghcjs/base.nix
View File

@ -33,7 +33,7 @@
, alex, happy, git, gnumake, autoconf, patch , alex, happy, git, gnumake, autoconf, patch
, automake, libtool , automake, libtool
, cryptohash , cryptohash
, haddock, hspec, xhtml, pkgs , haddock, hspec, xhtml, pkgs, pkgsHostHost
, coreutils , coreutils
, libiconv , libiconv
@ -137,7 +137,7 @@ in mkDerivation ({
isCross = true; isCross = true;
isGhcjs = true; isGhcjs = true;
inherit nodejs ghcjsBoot; inherit nodejs ghcjsBoot;
socket-io = pkgs.nodePackages."socket.io"; socket-io = pkgsHostHost.nodePackages."socket.io";
haskellCompilerName = "ghcjs-${version}"; haskellCompilerName = "ghcjs-${version}";
# let us assume ghcjs is never actually cross compiled # let us assume ghcjs is never actually cross compiled