summary refs log tree commit diff
path: root/pkgs/stdenv/generic
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-01-24 18:27:22 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-01-24 18:27:22 +0100
commitd9d9723ca72cd5eb658d5621e348dd5c5eeed8c6 (patch)
treec27c49743be5b084591ec775bbc28cd5ba982a91 /pkgs/stdenv/generic
parent8dba5cd41153ca2a749125033a84a9921cab0565 (diff)
downloadnixpkgs-d9d9723ca72cd5eb658d5621e348dd5c5eeed8c6.tar
nixpkgs-d9d9723ca72cd5eb658d5621e348dd5c5eeed8c6.tar.gz
nixpkgs-d9d9723ca72cd5eb658d5621e348dd5c5eeed8c6.tar.bz2
nixpkgs-d9d9723ca72cd5eb658d5621e348dd5c5eeed8c6.tar.lz
nixpkgs-d9d9723ca72cd5eb658d5621e348dd5c5eeed8c6.tar.xz
nixpkgs-d9d9723ca72cd5eb658d5621e348dd5c5eeed8c6.tar.zst
nixpkgs-d9d9723ca72cd5eb658d5621e348dd5c5eeed8c6.zip
With !allowUnfree, reject unfree-redistributable packages as well
Diffstat (limited to 'pkgs/stdenv/generic')
-rw-r--r--pkgs/stdenv/generic/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index b6836ca8d79..1a2d8ecf747 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -41,7 +41,7 @@ let
         # Add a utility function to produce derivations that use this
         # stdenv and its shell.
         mkDerivation = attrs:
-          if !allowUnfree && attrs.meta.license or "" == "unfree" then
+          if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then
             throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate"
           else
           (derivation (