nix-env -q --out-path: Support multiple outputs

We now print all output paths of a package, e.g.

  openssl-1.0.0i  bin=/nix/store/gq2mvh0wb9l90djvsagln3aqywqmr6vl-openssl-1.0.0i-bin;man=/nix/store/7zwf5r5hsdarl3n86dasvb4chm2xzw9n-openssl-1.0.0i-man;/nix/store/cj7xvk7fjp9q887359j75pw3pzjfmqf1-openssl-1.0.0i

or (in XML mode)

  <item attrPath="openssl" name="openssl-1.0.0i" system="x86_64-linux">
    <output name="bin" path="/nix/store/gq2mvh0wb9l90djvsagln3aqywqmr6vl-openssl-1.0.0i-bin" />
    <output name="man" path="/nix/store/7zwf5r5hsdarl3n86dasvb4chm2xzw9n-openssl-1.0.0i-man" />
    <output name="out" path="/nix/store/cj7xvk7fjp9q887359j75pw3pzjfmqf1-openssl-1.0.0i" />
  </item>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/libexpr/get-drvs.hh b/src/libexpr/get-drvs.hh
index f84636a1a..af3998e40 100644
--- a/src/libexpr/get-drvs.hh
+++ b/src/libexpr/get-drvs.hh
@@ -25,16 +25,20 @@ typedef std::map<string, MetaValue> MetaInfo;
 
 struct DrvInfo
 {
+public:
+    typedef std::map<string, Path> Outputs;
+
 private:
     string drvPath;
     string outPath;
     string outputName;
+    Outputs outputs;
 
     bool metaInfoRead;
     MetaInfo meta;
 
     bool failed; // set if we get an AssertionError
-    
+
 public:
     string name;
     string attrPath; /* path towards the derivation */
@@ -48,6 +52,7 @@ public:
     string queryDrvPath(EvalState & state) const;
     string queryOutPath(EvalState & state) const;
     string queryOutputName(EvalState & state) const;
+    Outputs queryOutputs(EvalState & state);
     MetaInfo queryMetaInfo(EvalState & state) const;
     MetaValue queryMetaInfo(EvalState & state, const string & name) const;
 
@@ -55,7 +60,7 @@ public:
     {
         drvPath = s;
     }
-    
+
     void setOutPath(const string & s)
     {
         outPath = s;
@@ -84,5 +89,5 @@ void getDerivations(EvalState & state, Value & v, const string & pathPrefix,
     Bindings & autoArgs, DrvInfos & drvs,
     bool ignoreAssertionFailures);
 
- 
+
 }