From b605d3089971e9c6dc6322e05abd32e16a0a0c60 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Tue, 17 Mar 2020 07:57:28 -0400
Subject: [PATCH] fix build

---
 default.nix        | 10 +---------
 pkgs/x/default.nix |  4 ++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/default.nix b/default.nix
index baad03b..d9d2cbd 100644
--- a/default.nix
+++ b/default.nix
@@ -4,11 +4,9 @@ let
   callPackage = pkgs.lib.callPackageWith (pkgs // self);
   x = callPackage ./pkgs/x { };
   quickserv = callPackage sources.quickserv { };
-  dhall = callPackage sources.easy-dhall-nix { };
 
   self = {
     # nix tools
-    dhallToNix = import ./pkgs/dhallToNix.nix;
     dockerImage = callPackage ./pkgs/dockerImage.nix { };
     srcNoTarget = import ./pkgs/srcNoTarget.nix;
 
@@ -19,13 +17,6 @@ let
     MoonPlus = callPackage ./pkgs/moonplus { };
     minica = callPackage ./pkgs/minica { };
 
-    # dhall
-    dhall = dhall.dhall-simple;
-    dhall-bash = dhall.dhall-bash-simple;
-    dhall-nix = dhall.dhall-nix-simple;
-    dhall-json = dhall.dhall-json-simple;
-    dhall-yaml = dhall.dhall-yaml-simple;
-
     # lojban
     johaus = callPackage ./pkgs/johaus { };
     jvozba = callPackage ./pkgs/jvozba { };
@@ -38,6 +29,7 @@ let
 
     # x
     appsluggr = x.appsluggr;
+    dnsd = x.dnsd;
     license = x.license;
     mainsanow = x.mainsanow;
     prefix = x.prefix;
diff --git a/pkgs/x/default.nix b/pkgs/x/default.nix
index 76f4245..f5c9c43 100644
--- a/pkgs/x/default.nix
+++ b/pkgs/x/default.nix
@@ -20,6 +20,7 @@ let
 
     subPackages = [
       "cmd/appsluggr"
+      "cmd/dnsd"
       "cmd/johaus"
       "cmd/license"
       "cmd/mainsanow"
@@ -30,6 +31,7 @@ let
     outputs = [
       "out" # keep the default output but don't use it
       "appsluggr"
+      "dnsd"
       "johaus"
       "license"
       "mainsanow"
@@ -40,6 +42,7 @@ let
     installPhase = ''
       dir=$GOPATH/bin
       install -D $dir/appsluggr $appsluggr/bin/appsluggr
+      install -D $dir/dnsd $dnsd/bin/dnsd
       install -D $dir/johaus $johaus/bin/johaus
       install -D $dir/license $license/bin/license
       install -D $dir/mainsanow $mainsanow/bin/mainsanow
@@ -52,6 +55,7 @@ let
 
 in {
   appsluggr = out.appsluggr;
+  dnsd = out.dnsd;
   quickserv = out.quickserv;
   johaus = out.johaus;
   license = out.license;