From 3bb6805738d09250bcbd7c9da0eb06b68072f4e3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 21 Apr 2018 23:36:43 +0200
Subject: Revamp inclusion

---
 default.nix | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/default.nix b/default.nix
index aafeb4a..40cc1d5 100644
--- a/default.nix
+++ b/default.nix
@@ -1,24 +1,18 @@
-args@{
-  compilerName ? null
-, extraPackages ? (p: [])
+{
+  extraPackages ? (p: [])
+, callPackage
 , ...
 }:
 
-let
-  defaultPackages = import <nixpkgs> {};
-  haskellPackages = defaultPackages.haskellPackages;
-  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-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 {};
   };
-in self // { inherit haskellPackages; }
+  thermoprint-webgui = callPackage ./webgui/thermoprint-webgui.nix {};
+  tprint = callPackage ./tprint/tprint.nix {};
+  bbcode = callPackage ./bbcode/bbcode.nix {};
+}
-- 
cgit v1.2.3