Turn more licenses into lib.licenses style

Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739

12 files changed, 36 insertions, 36 deletions

diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix
index 61e8571c4766..42a1b19c4d7a 100644
--- a/pkgs/games/blackshades/default.nix
+++ b/pkgs/games/blackshades/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://icculus.org/blackshades/;
     description = "Protect the VIP";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix
index 882f5f3cde6b..0709692552c2 100644
--- a/pkgs/games/bsdgames/default.nix
+++ b/pkgs/games/bsdgames/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.t2-project.org/packages/bsd-games.html";
     description = "Ports of all the games from NetBSD-current that are free";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix
index ca348592d1d2..ab8c76680d40 100644
--- a/pkgs/games/d1x-rebirth/default.nix
+++ b/pkgs/games/d1x-rebirth/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.dxx-rebirth.com/;
     description = "Source Port of the Descent 1 engine";
-    license = "BSD"; # Parallax license, like BSD I think
+    license = stdenv.lib.licenses.mit;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [viric];
   };
diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix
index 644c27035996..58df972257e5 100644
--- a/pkgs/games/d2x-rebirth/default.nix
+++ b/pkgs/games/d2x-rebirth/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.dxx-rebirth.com/;
     description = "Source Port of the Descent 2 engine";
-    license = "BSD"; # Parallax license, like BSD I think
+    license = stdenv.lib.licenses.mit;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [viric];
   };
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 6e53aff65a57..c9d421eac9be 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   meta = {
       description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world";
       homepage = http://www.bay12games.com/dwarves;
-      license = "unfree-redistributable";
+      license = stdenv.lib.licenses.unfreeRedistributable;
       maintainers = [stdenv.lib.maintainers.roconnor];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix
index 64a3e5bc9755..406c45d3414b 100644
--- a/pkgs/games/dwarf-fortress/df2014.nix
+++ b/pkgs/games/dwarf-fortress/df2014.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
   meta = {
       description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world";
       homepage = http://www.bay12games.com/dwarves;
-      license = "unfree-redistributable";
+      license = stdenv.lib.licenses.unfreeRedistributable;
       maintainers = [stdenv.lib.maintainers.roconnor];
   };
 }
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 4f1b126ac47e..1d93b24d38ab 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "eduke32-20130303-3542";
-  
+
   src = fetchurl {
     url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2;
     sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc";
   };
-  
+
   buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
-  
+
   NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
   NIX_LDFLAGS = "-L${SDL}/lib -lgcc_s";
-  
+
   desktopItem = makeDesktopItem {
     name = "eduke32";
     exec = "eduke32-wrapper";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -i -e "s|/usr/bin/sdl-config|${SDL}/bin/sdl-config|" build/Makefile.shared
   '';
-  
+
   buildPhase = ''
     make OPTLEVEL=0
   '';
@@ -34,34 +34,34 @@ stdenv.mkDerivation rec {
   installPhase = ''
     # Install binaries
     mkdir -p $out/bin
-    cp eduke32 mapster32 $out/bin 
-    
+    cp eduke32 mapster32 $out/bin
+
     # Make wrapper script
     cat > $out/bin/eduke32-wrapper <<EOF
     #!/bin/sh
-    
+
     if [ "$EDUKE32_DATA_DIR" = "" ]
-    then 
+    then
         EDUKE32_DATA_DIR=/var/lib/games/eduke32
     fi
     if [ "$EDUKE32_GRP_FILE" = "" ]
     then
         EDUKE32_GRP_FILE=\$EDUKE32_DATA_DIR/DUKE3D.GRP
     fi
-    
+
     cd \$EDUKE32_DATA_DIR
-    eduke32 -g \$EDUKE32_GRP_FILE    
+    eduke32 -g \$EDUKE32_GRP_FILE
     EOF
     chmod 755 $out/bin/eduke32-wrapper
-    
+
     # Install desktop item
     mkdir -p $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
   '';
-  
+
   meta = {
     description = "Enhanched port of Duke Nukem 3D for various platforms";
-    license = "GPLv2+ and BUILD license";
+    license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://eduke32.com;
     maintainers = [ stdenv.lib.maintainers.sander ];
   };
diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix
index c97ba4d5bf4e..9e8d3ce0b8e7 100644
--- a/pkgs/games/hexen/default.nix
+++ b/pkgs/games/hexen/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.libsdl.org/projects/hexen/;
     description = "Port of Raven Software's popular Hexen 3-D shooter game";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 70bda820e2ec..3198ad785f09 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation {
       description = "A sandbox-building game";
       homepage = http://www.minecraft.net;
       maintainers = [ stdenv.lib.maintainers.page ];
-      license = "unfree-redistributable";
+      license = stdenv.lib.licenses.unfreeRedistributable;
   };
 }
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 403fc88cb4ad..e913b0bb2a8a 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -94,7 +94,7 @@ let
       '';
 
       homepage = http://www.simutrans.com/;
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ stdenv.lib.maintainers.kkallio ];
       platforms = stdenv.lib.platforms.linux;
     };
diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index a61d2f370d04..7fd13ccab3b0 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , mesa, SDL, cmake, eigen
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -35,8 +35,8 @@ rec {
 
   setVars = a.noDepEntry ''
     export EIGENDIR=${a.eigen}/include/eigen2
-  ''; 
-      
+  '';
+
   meta = {
     description = "A physics-based puzzle game";
     maintainers = with a.lib.maintainers;
@@ -45,7 +45,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
     broken = true;
   };
   passthru = {
diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index b94633d8d3a6..d7b1c1880769 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "2.7.3" a; 
+  version = a.lib.attrByPath ["version"] "2.7.3" a;
   buildInputs = with a; [
     ncurses flex bison autoconf automake m4
   ];
@@ -17,7 +17,7 @@ rec {
   configureFlags = [];
 
   preConfigure = a.fullDepEntry (''
-    chmod a+rwX -R . 
+    chmod a+rwX -R .
     sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in
     sed -e '/FIXED_PATHS/d' -i src/z-config.h
     ./bootstrap
@@ -42,7 +42,7 @@ rec {
       done
       mkdir -p lib/user lib/save
       for i in lib/*/*.raw; do
-        test -L "$i" && rm "$i"; 
+        test -L "$i" && rm "$i";
       done
       for i in $(find lib -type l); do if ! test -e $(readlink "$i"); then rm "$i"; fi; done;
       export ANGBAND_PATH="$PWD"
@@ -53,10 +53,10 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["preConfigure" "doConfigure" "doMakeInstall" "postInstall"];
-      
+
   name = "zangband-" + version;
   meta = {
     description = "rogue-like game";
-    license = "non-free"; # Basically "not for commercial profit"
+    license = a.lib.licenses.unfree;
   };
 }