From 59a7e3d173c23096fe3122505b1b759f26e3292a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 23 Jan 2017 16:08:09 +0100
Subject: Fix build

---
 default.nix | 10 +++++++---
 shell.nix   |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/default.nix b/default.nix
index 0aa8c9e..09e2b7b 100644
--- a/default.nix
+++ b/default.nix
@@ -3,8 +3,12 @@
 }:
 
 rec {
-  haskellPackages = pkgs.haskell.packages."${compilerName}";
-  threepenny-gui = pkgs.haskell.lib.appendPatch haskellPackages.threepenny-gui ./threepenny.patch;
+  haskellPackages = pkgs.haskell.packages."${compilerName}".override {
+    overrides = self: super: with super; {
+      # threepenny-gui = pkgs.haskell.lib.appendPatch threepenny-gui ./threepenny.patch;
+      encoding = pkgs.haskell.lib.doJailbreak encoding;
+    };
+  };
   thermoprint-spec = haskellPackages.callPackage ./spec/thermoprint-spec.nix {};
   thermoprint-bbcode = haskellPackages.callPackage ./tp-bbcode/thermoprint-bbcode.nix {
     inherit bbcode thermoprint-spec;
@@ -19,7 +23,7 @@ rec {
     };
   };
   thermoprint-webgui = haskellPackages.callPackage ./webgui/thermoprint-webgui.nix {
-    inherit thermoprint-bbcode thermoprint-client threepenny-gui;
+    inherit thermoprint-bbcode thermoprint-client;
   };
   tprint = haskellPackages.callPackage ./tprint/tprint.nix {
     inherit thermoprint-bbcode thermoprint-client;
diff --git a/shell.nix b/shell.nix
index f0a69b4..55efcc5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,13 +5,13 @@
 let
   thermoprintPackages = builtins.attrValues (import ./default.nix {});
   ghc = haskellPackages.ghcWithPackages
-    (ps: thermoprintPackages ++ utilities ps ++ testDeps ps);
+    (ps: utilities ps ++ testDeps ps);
   utilities = (ps: with ps; [ hlint cabal2nix ]);
   testDeps = (ps: with ps; [ temporary hspec ]);
 in
 pkgs.stdenv.mkDerivation rec {
   name = "thermoprint-env";
-  buildInputs = [ ghc ];
+  buildInputs = (with pkgs; [ gup ]) ++ [ ghc ];
   shellHook = ''
     eval $(egrep ^export ${ghc}/bin/ghc)
     export PROMPT_INFO="${name}"
-- 
cgit v1.2.3