diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:44:33 +0000 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:48:16 +0000 |
| commit | 007f80c1d0440b89970000b92f78ce76186d99a5 (patch) | |
| tree | 4e1b441ae8f3d451ebecde034fd4bc8456286f0c /pkgs/applications/networking/browsers | |
| parent | d91986c24f1abc34b9785d9e4cd6dbe0bf398853 (diff) | |
| download | nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.gz nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.bz2 nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.lz nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.xz nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.zst nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.zip | |
Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me. Relevant: issue #2999, issue #739
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/netsurf/haru.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/opera/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix index 47f0c2f64552..7aa362c613fd 100644 --- a/pkgs/applications/networking/browsers/netsurf/haru.nix +++ b/pkgs/applications/networking/browsers/netsurf/haru.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation { installPhase = "make PREFIX=$out install"; - meta = { + meta = { description = "cross platform, open source library for generating PDF files"; homepage = http://libharu.org/wiki/Main_Page; - license = "ZLIB/LIBPNG"; # see README. + license = with stdenv.lib.licenses; [ libpng zlib ]; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e1bcbf923677..d0fe7e91989d 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opera.com; description = "Web browser"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } |