From 007f80c1d0440b89970000b92f78ce76186d99a5 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 6 Nov 2014 00:44:33 +0000 Subject: Turn more licenses into lib.licenses style Should eval cleanly, as far as -A tarball tells me. Relevant: issue #2999, issue #739 --- pkgs/games/zangband/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/games/zangband') diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index b94633d8d3a..d7b1c188076 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; }; } -- cgit 1.4.1