diff options
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/dcraw/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/exiftags/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/jhead/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngcrush/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/povray/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/welkin/default.nix | 11 |
6 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 72b50bd4e77..5dcac6a0215 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cybercom.net/~dcoffin/dcraw/; description = "Decoder for many camera raw picture formats"; - license = "free"; + license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; allBut cygwin; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 531e17b92cb..ea729d71be2 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://johnst.org/sw/exiftags/; description = "Displays EXIF data from JPEG files"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index c497d60aef9..ee44ff975bb 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.sentex.net/~mwandel/jhead/; description = "Exif Jpeg header manipulation tool"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 0419732949d..79902582ff4 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pmt.sourceforge.net/pngcrush; description = "A PNG optimizer"; - license = "free"; + license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 79ca54fe0ed..2ee419a0512 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation { PATH="$TMP/bin:$PATH" done ''; - + meta = { homepage = http://www.povray.org/; description = "Persistence of Vision Raytracer"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 23c5ec11aaa..3d1a2aa5bdc 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , jre , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["jre"]; buildInputs = map (n: builtins.getAttr n x) @@ -39,7 +39,7 @@ rec { sed -e 's@[.]/lib/welkin[.]jar@"'"$out"'/share/welkin/lib/welkin.jar"@' -i "$out/share/welkin/welkin.sh" chmod a+x "$out/bin/welkin" '' ["minInit" "defEnsureDir"]; - + meta = { description = "An RDF visualizer"; maintainers = with a.lib.maintainers; @@ -47,7 +47,7 @@ rec { raskin ]; hydraPlatforms = []; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -55,4 +55,3 @@ rec { }; }; }) x - |