diff options
author | Jonathan Glines <auntieNeo@gmail.com> | 2014-06-13 11:54:19 -0600 |
---|---|---|
committer | Jonathan Glines <auntieNeo@gmail.com> | 2014-06-13 11:54:19 -0600 |
commit | 2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db (patch) | |
tree | 1db0d6305ca9dc9ad4767c46a88731a006b3c7fb /pkgs/tools/X11/nitrogen | |
parent | c977673bb53b632f50f368b4aab69eb3d5a7f9b9 (diff) | |
parent | 13befa3979d6ac98a96880fba9a3239bc333e644 (diff) |
Merge branch 'master' into nitrogen. Added maintainer and license.
Conflicts:
pkgs/tools/X11/nitrogen/default.nix
Diffstat (limited to 'pkgs/tools/X11/nitrogen')
-rw-r--r-- | pkgs/tools/X11/nitrogen/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 1f233937cfe2..5648b5715ecf 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "A background browser and setter for X windows"; homepage = http://projects.l3ib.org/nitrogen/; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; + maintainer = [ stdenv.lib.maintainers.auntie ]; }; } |