summaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2016-12-26 23:53:55 +0100
committerDaiderd Jordan <daiderd@gmail.com>2016-12-26 23:55:23 +0100
commit3ec1300c6745dbd1c4072d6eb2ade3d264e0b2aa (patch)
tree7bfd80e7070bad624e0570f6ead02ec158dc4bf2 /pkgs
parentbc5fc1af322d544a1b5c6c337cfb9f20e893d8f2 (diff)
nix-script: resolve drv path
Diffstat (limited to 'pkgs')
-rwxr-xr-xpkgs/nix-tools/nix.sh19
1 files changed, 18 insertions, 1 deletions
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