From eba59ad69607c8132317b986fed2403502dc646f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 4 Nov 2015 13:51:56 +0100
Subject: structure poking

---
 custom/tinc/yggdrasil.nix | 7 +++----
 ymir.nix                  | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index ef673c80..4191d2c4 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -1,10 +1,9 @@
-{ config
-, stdenv
+{ stdenv
 , nettools
 , openresolv
+, name
 , connect ? true
 , ipConf ? {}
-, ...
 }:
 
 
@@ -12,7 +11,7 @@ let
   connectTo = if connect then "" else "ConnectTo = ymir";
 in {
   "yggdrasil" = {
-    name = config.networking.hostName;
+    inherit name;
     debugLevel = 2;
     hosts = ( import ./yggdrasil-hosts.nix );
     extraConfig = connectTo;
diff --git a/ymir.nix b/ymir.nix
index 1c9d8aa3..502e608b 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -145,7 +145,9 @@ in {
     chmod 0640 /etc/shadow
   '';
 
-  services.customTinc.networks = (pkgs.callPackage ./custom/tinc/yggdrasil.nix {
+  services.customTinc.networks = ((import ./custom/tinc/yggdrasil.nix) {
+    inherit (pkgs) stdenv nettools openresolv;
+    name = "ymir";
     connect = false;
     ipConf = {
       ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ];
-- 
cgit v1.2.3