From 202d5bbda578fcc8ff564c107f5f9dcfd5b1bc2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue, 15 Feb 2005 12:05:47 +0000
Subject: [PATCH] * Compatibility with older GCCs.
---
src/nix-env/main.cc | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc
index 2db59e4b1..6e4ba61e5 100644
--- a/src/nix-env/main.cc
+++ b/src/nix-env/main.cc
@@ -341,7 +341,8 @@ static void queryInstSources(EvalState & state,
argument, e.g., if the file is `./foo.nix', then the
argument `x: x.bar' is equivalent to `(x: x.bar)
(import ./foo.nix)' = `(import ./foo.nix).bar'. */
- case srcNixExprs:
+ case srcNixExprs: {
+
Expr e1 = parseExprFromFile(state,
absPath(instSource.nixExprPath));
@@ -355,8 +356,12 @@ static void queryInstSources(EvalState & state,
}
break;
-
- case srcStorePaths:
+ }
+
+ /* The available user environment elements are specified as a
+ list of store paths (which may or may not be
+ derivations). */
+ case srcStorePaths: {
for (Strings::const_iterator i = args.begin();
i != args.end(); ++i)
@@ -384,11 +389,16 @@ static void queryInstSources(EvalState & state,
}
break;
-
- case srcProfile:
+ }
+
+ /* Get the available user environment elements from another
+ user environment. These are then filtered as in the
+ `srcNixExprDrvs' case. */
+ case srcProfile: {
elems = filterBySelector(
queryInstalled(state, instSource.profile), args);
break;
+ }
}
}
--
GitLab