Try to pull in iohk-nix’s support for Template Haskell

entropia · Mar 17, 2019 · 37d2eb6 · 37d2eb6
1 parent 41bd40e
commit 37d2eb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/nix/default.nix b/nix/default.nix
@@ -1,3 +1,5 @@
+let localLib = import ./lib.nix; in
+
 let
   tttool-exe = pkgs:
     let
@@ -10,7 +12,8 @@ let
         name   = "haskell-lib-source";
       };
       haskell = import haskellLib { inherit pkgs; };
-      nix-tools = import ./pkgs.nix { inherit haskell pkgs; };
+      iohk-module = localLib.nix-tools.iohk-module;
+      nix-tools = import ./pkgs.nix { inherit pkgs haskell iohk-module; };
     in
     nix-tools.tttool.components.exes.tttool;
 
@@ -30,7 +33,6 @@ let
 in
 
 let
-  localLib = import ./lib.nix;
   pkgs = localLib.iohkNix.getPkgs {};
   pkgs-static = localLib.iohkNix.getPkgs { crossSystem = localLib.systems.examples.musl64; };
   pkgs-windows = localLib.iohkNix.getPkgs { crossSystem = localLib.systems.examples.mingwW64; };

diff --git a/nix/pkgs.nix b/nix/pkgs.nix
@@ -8,6 +8,7 @@
 
 { pkgs ? import <nixpkgs> {}
 , haskell
+, iohk-module
 , ...
 }:
 let
@@ -30,6 +31,7 @@ let
       (hackage: { mintty = hackage.mintty."0.1.2".revisions.default; })
       ];
     modules = [
+      (iohk-module { nixpkgs = pkgs; th-packages = [ "tttool" ]; })
       {
         # The plan produced by plan-to-nix does not include all necessary flag assignments
         packages.haskeline.flags.terminfo = false;