Started work on math compilation

1 files changed, 23 insertions, 19 deletions

diff --git a/default.nix b/default.nix
index b5d5fed..73581f5 100644
--- a/default.nix
+++ b/default.nix
@@ -1,21 +1,25 @@
-let
-  pkgs = import <nixpkgs> {};
-  overrideCabal = drv: f: (drv.override (args: args // {
-    mkDerivation = drv: args.mkDerivation (drv // f drv);
-  })) // {
-    overrideScope = scope: overrideCabal (drv.overrideScope scope) f;
+{ pkgs ? (import <nixpkgs> {})
+}:
+    
+rec {
+  dirty-haskell = pkgs.stdenv.lib.overrideDerivation (pkgs.haskellPackages.callPackage ./blog.nix {})
+    (attrs :
+      { src = ./.;
+              shellHook = ''
+                export PROMPT_INFO=${attrs.name}
+              '';
+            }
+    );
+  texEnv = with pkgs; texLiveAggregationFun {
+    paths = [ texLive texLiveExtra lmodern libertine tipa texLiveContext texLiveCMSuper ];
+  };
+  dirty-haskell-wrapper = pkgs.stdenv.mkDerivation rec {
+    name = "dirty-haskell-wrapper";
+    buildInputs = [ pkgs.makeWrapper ];
+    buildCommand = ''
+      mkdir -p $out/bin
+      makeWrapper ${dirty-haskell}/bin/site $out/bin/dirty-haskell \
+        --append PATH : ${texEnv}/bin
+    '';
   };
-  dontCheck = drv: overrideCabal drv (drv: { doCheck = false; });
-in rec {
-  dirty-haskell = pkgs.stdenv.lib.overrideDerivation (
-    (pkgs.haskellngPackages.callPackage ./blog.nix {}).override (attrs: attrs // {
-      hakyll = dontCheck pkgs.haskellngPackages.hakyll;
-    })
-    ) (attrs : {
-            src = ./.;
-            shellHook = ''
-              export PROMPT_INFO=${attrs.name}
-            '';
-          }
-  );
 }