From 8f599f45e31bb465a4aa9fe78d34dfc2323b9aeb Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 30 Mar 2019 17:30:23 +0100
Subject: Fix build instructions
---
README.md | 5 ++++-
shell.nix | 12 ++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 359df8b..917dc41 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,10 @@ Ziel dieser Arbeit ist es, aus der Behebung dieser Einschränkung heraus einen G
## Build
```
-nix-shell --command make
+nix-shell
+mkdir -p build/tikzcache
+ln -s build/tikzcache .
+make
```
Die Rohdaten der dokumentierten Simulationsergebnisse finden sich in `img/data`.
diff --git a/shell.nix b/shell.nix
index 76a3be4..b99cd78 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,12 +1,12 @@
-with import <nixpkgs> {};
+{ pkgs ? import <nixpkgs> { }, ... }:
-stdenv.mkDerivation rec {
+pkgs.stdenv.mkDerivation rec {
name = "latex-env";
- env = buildEnv { name = name; paths = buildInputs; };
+ env = pkgs.buildEnv { name = name; paths = buildInputs; };
buildInputs = let
- texlive-custom = texlive.combine {
- inherit (texlive) scheme-small collection-langgerman latexmk
+ texlive-custom = pkgs.texlive.combine {
+ inherit (pkgs.texlive) scheme-small collection-langgerman latexmk
amsmath
abstract
cm-super
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
adjustbox collectbox
;
};
- in [
+ in with pkgs; [
gnumake
texlive-custom biber
python3Packages.pygments
--
cgit v1.2.3