From fe31244529c49ced081348b7db66e78eabc809dd Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 27 Sep 2018 22:16:53 +0200
Subject: Use shared Nix derivations of XSLT build stack

---
 shell.nix | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index 714c2bc..719b8df 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,18 +1,20 @@
-with import <nixpkgs> {};
+{ system ? builtins.currentSystem }:
 
-stdenv.mkDerivation rec {
-  name = "blog-env";
-  env = buildEnv { name = name; paths = buildInputs; };
+let
+  pkgs    = import <nixpkgs> { inherit system; };
+  mypkgs  = import (fetchTarball "https://pkgs.kummerlaender.eu/nixexprs.tar.gz") { };
 
-  buildInputs = let
-    generate  = pkgs.callPackage ./pkgs/generate.nix {};
-    preview   = pkgs.callPackage ./pkgs/preview.nix {};
-    katex     = pkgs.callPackage ./pkgs/KaTeX.nix {};
-  in [
-    generate
-    preview
-    pandoc
-    highlight
-    katex
+in pkgs.stdenv.mkDerivation rec {
+  name = "blog.kummerlaender.eu";
+
+  buildInputs = [
+    pkgs.pandoc
+    pkgs.highlight
+    mypkgs.katex-wrapper
+    mypkgs.make-xslt
   ];
+
+  shellHook = ''
+    export NIX_SHELL_NAME="${name}"
+  '';
 }
-- 
cgit v1.2.3