* Extra bit `S' in `--query --status' output: show whether there are

  any substitutes for the derivation.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc
index eaa11fe259..a2e9b119ae 100644
--- a/src/nix-env/main.cc
+++ b/src/nix-env/main.cc
@@ -606,10 +606,12 @@ static void opQuery(Globals & globals,
                 installedPaths.insert(i->second.outPath);
             
             for (DrvInfos::iterator i = drvs.begin(); i != drvs.end(); ++i) {
-                cout << format("%1%%2% %3%\n")
+                Paths subs = querySubstitutes(i->second.drvPath);
+                cout << format("%1%%2%%3% %4%\n")
                     % (installedPaths.find(i->second.outPath)
                         != installedPaths.end() ? 'I' : '-')
                     % (isValidPath(i->second.outPath) ? 'P' : '-')
+                    % (subs.size() > 0 ? 'S' : '-')
                     % i->second.name;
             }
             break;