From b632153ebd1bf8d773872eb36f9ad335d2c89fab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Feb 2014 10:25:13 +0100
Subject: nix-shell: Use shell.nix as the default expression if it exists

---
 scripts/nix-build.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/nix-build.in b/scripts/nix-build.in
index 168730bbc..fff71021f 100755
--- a/scripts/nix-build.in
+++ b/scripts/nix-build.in
@@ -149,7 +149,8 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
     }
 }
 
-@exprs = ("./default.nix") if scalar @exprs == 0;
+@exprs = ("shell.nix") if scalar @exprs == 0 && $runEnv && -e "shell.nix";
+@exprs = ("default.nix") if scalar @exprs == 0;
 
 $ENV{'IN_NIX_SHELL'} = 1 if $runEnv;
 
-- 
cgit v1.2.3