summary refs log tree commit diff
path: root/pkgs/stdenv/generic
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-06-17 14:59:39 -0500
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-06-17 15:00:24 -0500
commite5d63646a092a51f0ad7f38c4d99d2b5685c07ba (patch)
tree2b263bfb574dc64b5ed4b584ad4bb2e7b3bfa68e /pkgs/stdenv/generic
parent97d65d801044e37106119bc383cdc8abe840b843 (diff)
downloadnixpkgs-e5d63646a092a51f0ad7f38c4d99d2b5685c07ba.tar
nixpkgs-e5d63646a092a51f0ad7f38c4d99d2b5685c07ba.tar.gz
nixpkgs-e5d63646a092a51f0ad7f38c4d99d2b5685c07ba.tar.bz2
nixpkgs-e5d63646a092a51f0ad7f38c4d99d2b5685c07ba.tar.lz
nixpkgs-e5d63646a092a51f0ad7f38c4d99d2b5685c07ba.tar.xz
nixpkgs-e5d63646a092a51f0ad7f38c4d99d2b5685c07ba.tar.zst
nixpkgs-e5d63646a092a51f0ad7f38c4d99d2b5685c07ba.zip
Don't suggest using --arg config '{ allowUnfree = true; }'
This doesn't work when using the Nixpkgs/NixOS channel.

Issue #2998.
Diffstat (limited to 'pkgs/stdenv/generic')
-rw-r--r--pkgs/stdenv/generic/default.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index c34d30d92e0..6047ecf853c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -82,9 +82,7 @@ let
               { nixpkgs.config.allowUnfree = true; }
             in configuration.nix to override this. If you use Nix standalone, you can add
               { allowUnfree = true; }
-            to ~/.nixpkgs/config.nix or pass
-              --arg config '{ allowUnfree = true; }'
-            on the command line.''
+            to ~/.nixpkgs/config.nix.''
         else if !allowBroken && attrs.meta.broken or false then
           throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken"
         else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then