From db4d075af291db2ba75961c0980bb33daf6fcf20 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 7 Nov 2021 00:05:55 +0100 Subject: [PATCH] pkgs/network-graphs: don't use callPackage as it breaks the flake --- nix/pkgs/default.nix | 2 +- nix/pkgs/network-graphs.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 1573b90..6449b7b 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -25,7 +25,7 @@ let ) (builtins.attrNames config.site.hosts) ); - network-graphs = pkgs.callPackage ./network-graphs.nix { inherit config; }; + network-graphs = import ./network-graphs.nix { inherit config pkgs; }; mkRootfs = hostName: self.nixosConfigurations.${hostName}.config.system.build.toplevel; diff --git a/nix/pkgs/network-graphs.nix b/nix/pkgs/network-graphs.nix index c3c33c0..ea5dde9 100644 --- a/nix/pkgs/network-graphs.nix +++ b/nix/pkgs/network-graphs.nix @@ -1,5 +1,7 @@ -{ lib, config, runCommand, graphviz, ... }: +{ config, pkgs, ... }: let + inherit (pkgs) lib runCommand graphviz; + netColor = net: if net == "core" then "grey"