about summary refs log tree commit diff
path: root/pkgs/tools/X11/nitrogen
diff options
context:
space:
mode:
authorJonathan Glines <auntieNeo@gmail.com>2014-06-13 11:54:19 -0600
committerJonathan Glines <auntieNeo@gmail.com>2014-06-13 11:54:19 -0600
commit2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db (patch)
tree1db0d6305ca9dc9ad4767c46a88731a006b3c7fb /pkgs/tools/X11/nitrogen
parentc977673bb53b632f50f368b4aab69eb3d5a7f9b9 (diff)
parent13befa3979d6ac98a96880fba9a3239bc333e644 (diff)
downloadnixlib-2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db.tar
nixlib-2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db.tar.gz
nixlib-2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db.tar.bz2
nixlib-2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db.tar.lz
nixlib-2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db.tar.xz
nixlib-2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db.tar.zst
nixlib-2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db.zip
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.nix2
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 ];
   };
 }