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/misc | |
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/misc')
-rw-r--r-- | pkgs/applications/misc/d4x/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/vue/default.nix | 15 | ||||
-rw-r--r-- | pkgs/applications/misc/xfontsel/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/xlsfonts/default.nix | 2 |
4 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index 66fceec9a51b..3c146249dd0b 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "d4x-2.5.7.1"; - + inherit boost; src = fetchurl { @@ -12,9 +12,9 @@ stdenv.mkDerivation { buildInputs = [ gtk glib pkgconfig openssl boost ]; - meta = { + meta = { description = "Graphical download manager"; homepage = http://www.krasu.ru/soft/chuchelo/; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; } diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 542f11f6e671..5133ad3c29eb 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , jre, unzip , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -32,11 +32,11 @@ rec { doDeploy = a.fullDepEntry '' mkdir -p "$out"/{share/vue,bin} cp ${src} "$out/share/vue/vue.jar" - echo '#!${a.stdenv.shell}' >> "$out/bin/vue" - echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" + echo '#!${a.stdenv.shell}' >> "$out/bin/vue" + echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" '' ["addInputs" "defEnsureDir"]; - + meta = { description = "Visual Understanding Environment - mind mapping software"; maintainers = with a.lib.maintainers; @@ -45,7 +45,6 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; # Apache License fork, actually + license = a.lib.licenses.free; # Apache License fork, actually }; }) x - diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 2bb05fe44e07..15d054c2be2a 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Allows testing the fonts available in an X server"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix index 06b09154ba55..7584ebf72fb1 100644 --- a/pkgs/applications/misc/xlsfonts/default.nix +++ b/pkgs/applications/misc/xlsfonts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Lists the fonts available in the X server"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; |