From 25386e5edc2d65c84ce824d2c964a5c029f4c30d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Mar 2014 17:31:13 +0100
Subject: Fix passing meta attribute to buildenv.nix

Since the meta attributes were not sorted, attribute lookup could
fail, leading to package priorities and active flags not working
correctly.

Broken since 0f24400d90daf65cf20142a662f8245008437e2c.
---
 src/nix-env/user-env.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/nix-env/user-env.cc')

diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc
index 75f5b54abf0a..a95c4cba937f 100644
--- a/src/nix-env/user-env.cc
+++ b/src/nix-env/user-env.cc
@@ -91,6 +91,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
             if (!v) continue;
             vMeta.attrs->push_back(Attr(state.symbols.create(*j), v));
         }
+        vMeta.attrs->sort();
         v.attrs->sort();
 
         if (drvPath != "") references.insert(drvPath);
-- 
cgit 1.4.1