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/graphics/gimp | |
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/graphics/gimp')
-rw-r--r-- | pkgs/applications/graphics/gimp/2.8.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/gimp/plugins/default.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index bd155c59c6b2..9f7643ad1c04 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; - license = "GPL"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 7139bc71f3c1..c5350228dcf2 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -59,7 +59,7 @@ rec { sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure ''; - meta = { + meta = { description = "The GIMP Animation Package"; homepage = http://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license @@ -174,10 +174,10 @@ rec { sourceRoot = "${name}/src"; buildPhase = "make gimp"; installPhase = "installPlugins gmic_gimp"; - meta = { + meta = { description = "script language for image processing which comes with its open-source interpreter"; homepage = http://gmic.sourceforge.net/repository.shtml; - license = "CeCILL FREE SOFTWARE LICENSE AGREEMENT"; + license = stdenv.lib.licenses.cecill20; /* The purpose of this Free Software license agreement is to grant users the right to modify and redistribute the software governed by this @@ -197,7 +197,7 @@ rec { # --enable-dst-correction - enable DST correction for file timestamps. # --enable-contrast - enable the contrast setting option. # --enable-interp-none: enable 'None' interpolation (mostly for debugging). - # --with-lensfun: use the lensfun library - experimental feature, read this before using it. + # --with-lensfun: use the lensfun library - experimental feature, read this before using it. # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; |