From e98a443e71cfa041bf690ed03d5b699c15875a25 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Wed, 7 Jan 2015 18:31:32 +0100
Subject: stdenv: improve message on evaluation check (no hash changes)

---
 pkgs/stdenv/generic/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 04c05162bb63..53940d211199 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -57,9 +57,10 @@ let
         assert (unfreeOrBroken == "Unfree" || unfreeOrBroken == "Broken");
         throw ''
           Package ‘${attrs.name}’ in ${pos'} ${whatIsWrong}, refusing to evaluate.
-          You can set
+          For `nixos-rebuild` you can set
             { nixpkgs.config.allow${unfreeOrBroken} = true; }
-          in configuration.nix to override this. If you use Nix standalone, you can add
+          in configuration.nix to override this.
+          For `nix-env` you can add
             { allow${unfreeOrBroken} = true; }
           to ~/.nixpkgs/config.nix.
         '';
-- 
cgit 1.4.1