diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-13 12:21:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-13 12:21:31 +0200 |
| commit | 17ae1617dc9b3363e9ab986f2934d85efffbc6b3 (patch) | |
| tree | 6e84d3e38be48edef4a42ba7bbbffddf82b338d2 /pkgs/games | |
| parent | 96dd66bf25195bb8036bf041a3d372898e660067 (diff) | |
| parent | a3fce096afcada408425f2798ebe1dfa13ac80e7 (diff) | |
| download | nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.gz nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.bz2 nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.lz nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.xz nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.zst nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.zip | |
Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates): pkgs/os-specific/linux/systemd/default.nix
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/oilrush/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 339c3bbd1a84..b96fd7c3e9f2 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { of Tower Defense. ''; homepage = http://oilrush-game.com/; - license = [ "proprietary" ]; + license = "unfree"; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; #platforms = with stdenv.lib.platforms; linux; }; |