diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index 0fa3ed20..9af78b0e 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -903,8 +903,17 @@ sub checkBuild {
             print STDERR "    added to queue as build ", $build->id, "\n";
         }
 
+        # Record which inputs where used.
         my %inputs;
         $inputs{$jobset->nixexprinput} = $nixExprInput;
+        foreach my $name (keys %{$inputInfo}) {
+            # Unconditionally include all inputs that were included in
+            # the Nix search path (through the -I flag).  We currently
+            # have no way to see which ones were actually used.
+            $inputs{$name} = $inputInfo->{$name}->[0]
+                if scalar @{$inputInfo->{$name}} == 1 
+                   && defined $inputInfo->{$name}->[0]->{storePath};
+        }
         foreach my $arg (@{$buildInfo->{arg}}) {
             $inputs{$arg->{name}} = $inputInfo->{$arg->{name}}->[$arg->{altnr}]
                 || die "invalid input";
diff --git a/src/script/hydra-evaluator b/src/script/hydra-evaluator
index ddf65f8b..839418e0 100755
--- a/src/script/hydra-evaluator
+++ b/src/script/hydra-evaluator
@@ -44,6 +44,7 @@ sub setJobsetError {
     sendJobsetErrorNotification($jobset, $errorMsg); 
 }
 
+
 sub sendJobsetErrorNotification() {
     my ($jobset, $errorMsg) = @_;