From 3ec1300c6745dbd1c4072d6eb2ade3d264e0b2aa Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 26 Dec 2016 23:53:55 +0100
Subject: [PATCH] nix-script: resolve drv path

---
 modules/examples/lnl.nix |  5 +++--
 pkgs/nix-tools/nix.sh    | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix
index d959b52..407e71b 100644
--- a/modules/examples/lnl.nix
+++ b/modules/examples/lnl.nix
@@ -22,7 +22,8 @@
   system.defaults.trackpad.Clicking = true;
 
   environment.systemPackages =
-    [ pkgs.curl
+    [ pkgs.lnl.nix-script
+      pkgs.curl
       pkgs.fzf
       pkgs.gettext
       pkgs.git
@@ -133,7 +134,7 @@
   environment.shellAliases.gl = "git log --graph --oneline";
   environment.shellAliases.gd = "git diff --minimal --patch";
 
-  environment.shellAliases.nix = "${pkgs.lnl.nix-script}/bin/nix";
+  # environment.shellAliases.nix = "${pkgs.lnl.nix-script}/bin/nix";
 
   nix.nixPath =
     [ # Use local nixpkgs checkout instead of channels.
diff --git a/pkgs/nix-tools/nix.sh b/pkgs/nix-tools/nix.sh
index d0f9643..031bb22 100755
--- a/pkgs/nix-tools/nix.sh
+++ b/pkgs/nix-tools/nix.sh
@@ -104,6 +104,7 @@ while [ "$#" -gt 0 ]; do
       extraNixFlags+=("$i" "$j")
       ;;
     --option|--arg|--argstr)
+      # nix-build
       if [ -z "$1" -o -z "$2" ]; then
         echo "$0: \`$i' requires two arguments"
         exit 1
@@ -112,9 +113,25 @@ while [ "$#" -gt 0 ]; do
       k="$1"; shift 1
       extraNixFlags+=("$i" "$j" "$k")
       ;;
+    --gc|--print-roots|--print-live|--print-dead)
+      # nix-store
+      extraNixFlags+=("$i")
+      ;;
+    -r|--max-freed)
+      # nix-store
+      if [ -z "$1" ]; then
+        echo "$0: \`$i' requires an argument"
+        exit 1
+      fi
+      j="$1"; shift 1
+      extraNixFlags+=("$i" "$j")
+      ;;
     --)
       break
       ;;
+    *'.drv')
+      src=$(readlink "$i")
+      ;;
     './'*|'<'*'>')
       src="$i"
       ;;
@@ -173,7 +190,7 @@ if [ "$action" = hash ]; then
 fi
 
 if [ "$action" = store ]; then
-  exec nix-store ${extraNixFlags[@]} "$exprArg"
+  exec nix-store ${extraNixFlags[@]}
 fi
 
 if [ "$action" = repl ]; then