diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/games/blackshades/default.nix | |
parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/games/blackshades/default.nix')
-rw-r--r-- | pkgs/games/blackshades/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 61e8571c47669..42a1b19c4d7ad 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/blackshades/; description = "Protect the VIP"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; |