From 98f6b407ec4ebf3b163cc229fe44d77fa453ad15 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 12 Dec 2016 11:08:23 +0100
Subject: [PATCH] add separate tools to systemPackages

---
 modules/nix/nix-tools.nix  | 9 ++-------
 pkgs/nix-tools/default.nix | 6 +++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/nix/nix-tools.nix b/modules/nix/nix-tools.nix
index 11b222b6..580244dd 100644
--- a/modules/nix/nix-tools.nix
+++ b/modules/nix/nix-tools.nix
@@ -9,15 +9,10 @@ in
 {
   config = {
 
-    system.build.nix = pkgs.runCommand "nix-darwin" {} ''
-      mkdir -p $out/bin
-      ln -s ${tools.darwin-option} $out/bin/darwin-option
-      ln -s ${tools.darwin-rebuild} $out/bin/darwin-rebuild
-    '';
-
     environment.systemPackages =
       [ # Include nix-tools by default
-        config.system.build.nix
+        tools.darwin-option
+        tools.darwin-rebuild
       ];
 
   };
diff --git a/pkgs/nix-tools/default.nix b/pkgs/nix-tools/default.nix
index acd3bb62..a6dd4fad 100644
--- a/pkgs/nix-tools/default.nix
+++ b/pkgs/nix-tools/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, writeScript, coreutils, nix }:
+{ stdenv, writeScriptBin, coreutils, nix }:
 
 {
-  darwin-option = writeScript "darwin-option" ''
+  darwin-option = writeScriptBin "darwin-option" ''
     #! ${stdenv.shell}
     set -e
 
@@ -9,7 +9,7 @@
     exit 1
   '';
 
-  darwin-rebuild = writeScript "darwin-rebuild" ''
+  darwin-rebuild = writeScriptBin "darwin-rebuild" ''
     #! ${stdenv.shell}
     set -e