wip

pkgs/development/compilers/ghcjs/default.nix

@@ -1,4 +1,5 @@
 { mkDerivation
+, haskellPackages
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
@@ -49,10 +50,12 @@
     src = ghcjsBootSrc;
   }
 , shims ? import ./shims.nix { inherit fetchFromGitHub; }
+
+, ghcLibdir ? null
 }:
 let
   inherit (bootPkgs) ghc;
-  version = "0.2.0";
+  version = "0.2.1";
 
 in mkDerivation (rec {
   pname = "ghcjs";
@@ -126,6 +129,7 @@ in mkDerivation (rec {
         --with-cabal ${cabal-install}/bin/cabal \
         --with-gmp-includes ${gmp.dev}/include \
         --with-gmp-libraries ${gmp.out}/lib
+    ${if ghcLibdir == null then "" else ''echo "${ghcLibdir}" >$out/lib/ghcjs-${version}/ghc_libdir''}
   '';
   passthru = let
     ghcjsNodePkgs = pkgs.nodePackages.override {
@@ -138,6 +142,7 @@ in mkDerivation (rec {
     isGhcjs = true;
     inherit nodejs ghcjsBoot;
     inherit (ghcjsNodePkgs) "socket.io";
+    ghcPackages = haskellPackages;
 
     # This is the list of the Stage 1 packages that are built into a booted ghcjs installation
     # It can be generated with the command:

pkgs/development/haskell-modules/with-packages-wrapper.nix

@@ -2,6 +2,7 @@
 , ignoreCollisions ? false, withLLVM ? false
 , postBuild ? ""
 , haskellPackages
+, ghcLibdir ? null
 }:
 
 # This wrapper works only with GHC 6.12 or later.
@@ -44,11 +45,19 @@ let
   llvm          = lib.makeBinPath
                   ([ llvmPackages.llvm ]
                    ++ lib.optional stdenv.isDarwin llvmPackages.clang);
+  ghcLibdirLink = stdenv.mkDerivation {
+    name = "ghc_libdir";
+    inherit ghcLibdir;
+    buildCommand = ''
+      mkdir -p ${libDir}
+      echo "$ghcLibdir" > ${libDir}/ghc_libdir_override
+    '';
+  };
 in
 if paths == [] && !withLLVM then ghc else
 buildEnv {
   inherit (ghc) name;
-  paths = paths ++ [ghc];
+  paths = paths ++ [ghc] ++ lib.optional isGhcjs ghcLibdirLink;
   inherit ignoreCollisions;
   postBuild = ''
     . ${makeWrapper}/nix-support/setup-hook
@@ -93,6 +102,7 @@ buildEnv {
     done
 
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
+    ${lib.optionalString (isGhcjs && ghcLibdir != null) "mv ${libDir}/ghc_libdir_override ${libDir}/ghc_libdir"}
     $out/bin/${ghcCommand}-pkg check
   '' + postBuild;
   passthru = {