From d5a165fb5160c0d0d1e158f5b78f6ed5a5d145bd Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Sat, 1 Feb 2020 17:46:24 +0000
Subject: [PATCH] fix???

---
 default.nix        |  9 +--------
 pkgs/x/default.nix | 38 ++------------------------------------
 2 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/default.nix b/default.nix
index 566d9b1..2f61cc1 100644
--- a/default.nix
+++ b/default.nix
@@ -5,15 +5,8 @@ let
 
   callPackage = pkgs.lib.callPackageWith (pkgs // self);
 
-  x = callPackage ./pkgs/x { };
-
   self = {
     MoonPlus = callPackage ./pkgs/moonplus { };
-    appsluggr = x.appsluggr;
-    johaus = x.johaus;
-    license = x.license;
-    mainsanow = x.mainsanow;
-    prefix = x.prefix;
-    quickserv = x.quickserv;
+    x = callPackage ./pkgs/x { };
   };
 in self
diff --git a/pkgs/x/default.nix b/pkgs/x/default.nix
index 5fd9bec..978c3d4 100644
--- a/pkgs/x/default.nix
+++ b/pkgs/x/default.nix
@@ -20,42 +20,8 @@ let
     allowGoReference = true;
 
     subPackages = [
-      "cmd/appsluggr"
-      "cmd/johaus"
-      "cmd/license"
-      "cmd/mainsanow"
-      "cmd/prefix"
-      "cmd/quickserv"
+      "./..."
     ];
-
-    outputs = [
-      "out" # keep the default output but don't use it
-      "appsluggr"
-      "johaus"
-      "license"
-      "mainsanow"
-      "prefix"
-      "quickserv"
-    ];
-
-    installPhase = ''
-      dir=$GOPATH/bin
-      install -D $dir/appsluggr $appsluggr/bin/appsluggr
-      install -D $dir/johaus $johaus/bin/johaus
-      install -D $dir/license $license/bin/license
-      install -D $dir/mainsanow $mainsanow/bin/mainsanow
-      install -D $dir/prefix $prefix/bin/prefix
-      install -D $dir/quickserv $quickserv/bin/quickserv
-      # let nix know that everything was fine
-      touch $out
-    '';
   };
 
-in {
-  appsluggr = out.appsluggr;
-  johaus = out.johaus;
-  license = out.license;
-  mainsanow = out.mainsanow;
-  prefix = out.prefix;
-  quickserv = out.quickserv;
-}
+in out