1 files changed, 19 insertions, 24 deletions

diff --git a/default.nix b/default.nix
index 4e65886..2b84d30 100644
--- a/default.nix
+++ b/default.nix
@@ -1,10 +1,12 @@
-{ pkgs ? (import <nixpkgs> {})
-, compilerName ? "ghc802"
+args@{
+  compilerName ? "ghc802"
 , extraPackages ? (p: [])
+, ...
 }:
 
-rec {
-  haskellPackages = pkgs.haskell.packages."${compilerName}".override {
+let
+  defaultPackages = import <nixpkgs> {};
+  haskellPackages = defaultPackages.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;
@@ -12,25 +14,18 @@ rec {
       extended-reals = pkgs.haskell.lib.doJailbreak extended-reals;
     };
   };
-  thermoprint-spec = haskellPackages.callPackage ./spec/thermoprint-spec.nix {};
-  thermoprint-bbcode = haskellPackages.callPackage ./tp-bbcode/thermoprint-bbcode.nix {
-    inherit bbcode thermoprint-spec;
-  };
-  thermoprint-client = haskellPackages.callPackage ./client/thermoprint-client.nix {
-    inherit thermoprint-spec;
-  };
-  thermoprint-server = pkgs.callPackage ./server/wrapped.nix {
-    inherit (haskellPackages) ghcWithPackages;
-    inherit extraPackages;
-    thermoprint-server = haskellPackages.callPackage ./server/thermoprint-server.nix {
-      inherit thermoprint-spec thermoprint-client;
+  pkgs = defaultPackages // haskellPackages // args;
+  callPackage = pkgs.lib.callPackageWith (pkgs // self);
+  self = {
+    thermoprint-spec = callPackage ./spec/thermoprint-spec.nix {};
+    thermoprint-bbcode = callPackage ./tp-bbcode/thermoprint-bbcode.nix {};
+    thermoprint-client = callPackage ./client/thermoprint-client.nix {};
+    thermoprint-server = callPackage ./server/wrapped.nix {
+      inherit extraPackages;
+      thermoprint-server = callPackage ./server/thermoprint-server.nix {};
     };
+    thermoprint-webgui = callPackage ./webgui/thermoprint-webgui.nix {};
+    tprint = callPackage ./tprint/tprint.nix {};
+    bbcode = callPackage ./bbcode/bbcode.nix {};
   };
-  thermoprint-webgui = haskellPackages.callPackage ./webgui/thermoprint-webgui.nix {
-    inherit thermoprint-bbcode thermoprint-client;
-  };
-  tprint = haskellPackages.callPackage ./tprint/tprint.nix {
-    inherit thermoprint-bbcode thermoprint-client;
-  };
-  bbcode = haskellPackages.callPackage ./bbcode/bbcode.nix {};
-}
+in self