summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-01-07 18:31:32 +0100
committerVladimír Čunát <vcunat@gmail.com>2015-01-11 21:38:19 +0100
commite98a443e71cfa041bf690ed03d5b699c15875a25 (patch)
tree4d7598e5001d6467200b5024f0fe7d8e0133236e /pkgs/stdenv
parent123a8bf9a58e817b694d35dc2622045e096c93fd (diff)
downloadnixpkgs-e98a443e71cfa041bf690ed03d5b699c15875a25.tar
nixpkgs-e98a443e71cfa041bf690ed03d5b699c15875a25.tar.gz
nixpkgs-e98a443e71cfa041bf690ed03d5b699c15875a25.tar.bz2
nixpkgs-e98a443e71cfa041bf690ed03d5b699c15875a25.tar.lz
nixpkgs-e98a443e71cfa041bf690ed03d5b699c15875a25.tar.xz
nixpkgs-e98a443e71cfa041bf690ed03d5b699c15875a25.tar.zst
nixpkgs-e98a443e71cfa041bf690ed03d5b699c15875a25.zip
stdenv: improve message on evaluation check (no hash changes)
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 04c05162bb6..53940d21119 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.
         '';