From cf72a61af2975979bbfda773cc17ef617d61cdac Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Tue, 16 Sep 2014 18:34:59 +0100
Subject: Add --force-name support for --set in nix-env, to support
 nix-install-package --set

---
 src/nix-env/nix-env.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/nix-env')

diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index c24165da8f1d..f5e8ee08c42f 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -700,6 +700,9 @@ static void opSet(Globals & globals, Strings opFlags, Strings opArgs)
 
     DrvInfo & drv(elems.front());
 
+    if (globals.forceName != "")
+        drv.name = globals.forceName;
+
     if (drv.queryDrvPath() != "") {
         PathSet paths = singleton<PathSet>(drv.queryDrvPath());
         printMissing(*store, paths);
-- 
cgit 1.4.1