From 29ceeb88a406b60b196b1aea30c5bc7aefb62f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 26 May 2023 22:28:37 +0200 Subject: [PATCH] network-graphs: use graphviz without X --- nix/pkgs/network-graphs.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nix/pkgs/network-graphs.nix b/nix/pkgs/network-graphs.nix index 275443f..3eef1c4 100644 --- a/nix/pkgs/network-graphs.nix +++ b/nix/pkgs/network-graphs.nix @@ -1,7 +1,5 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: let - inherit (pkgs) lib runCommand graphviz; - netColor = net: if net == "core" then "grey" @@ -82,13 +80,13 @@ let } ''; renderGraph = args@{ name, engine, ... }: - runCommand "${name}.png" { + pkgs.runCommand "${name}.png" { src = builtins.toFile "${name}.dot" ( toDot args ); } '' echo $src - ${graphviz}/bin/${engine} -Tpng $src > $out + ${pkgs.graphviz-nox}/bin/${engine} -Tpng $src > $out ''; in rec { @@ -162,7 +160,7 @@ in rec { ) (builtins.attrNames containers); }; - network-graphs = runCommand "network-graphs" {} '' + network-graphs = pkgs.runCommand "network-graphs" {} '' DIR=$out/share/doc/zentralwerk mkdir -p $DIR ln -s ${physical-graph} $DIR/physical.png