diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-05-27 21:56:04 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-05-27 22:00:06 +0200 |
| commit | b2d7f4b1ba937951fefdd026314512ab0be91508 (patch) | |
| tree | d1f7fc189bac34f376069294d67abfa3c8551693 /pkgs/development/libraries/java/rhino/default.nix | |
| parent | 87fd373aac3a1aaa84ddb328d43074aeebc1b133 (diff) | |
| download | nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.gz nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.bz2 nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.lz nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.xz nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.zst nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.zip | |
Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings remain. Where there was any possible ambiguity about the exact version or variant intended, nothing was changed. IANAL, nor a search robot. Use `with stdenv.lib` wherever it makes sense.
Diffstat (limited to 'pkgs/development/libraries/java/rhino/default.nix')
| -rw-r--r-- | pkgs/development/libraries/java/rhino/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 34aaded7cb4..74aa8c9ba16 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { cp -v *.jar "$out/share/java" ''; - meta = { + meta = with stdenv.lib; { description = "An implementation of JavaScript written in Java"; longDescription = @@ -52,6 +52,6 @@ stdenv.mkDerivation { homepage = http://www.mozilla.org/rhino/; - license = [ "MPLv1.1" /* or */ "GPLv2+" ]; + license = with licenses; [ mpl11 /* or */ gpl2Plus ]; }; } |