From d1c0b0f6ecb4cfd4f860d43e649c53ba172a68c6 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Fri, 19 Jun 2020 14:55:30 -0600
Subject: [PATCH] pkgs: add metadata and standardize

---
 flake.nix                                             |  4 +---
 .../display-managers/sddm/themes/chili/default.nix    |  1 +
 pkgs/data/fonts/dejavu-nerdfont/default.nix           |  2 +-
 pkgs/development/libraries/libinih/default.nix        | 10 +++++++++-
 pkgs/misc/drivers/wii-u-gc-adapter/default.nix        | 11 ++++++++++-
 pkgs/os-specific/linux/gamemode/default.nix           |  7 +++++++
 pkgs/shells/zsh/pure/default.nix                      |  2 +-
 7 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4138afa8..85b6686f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,9 +48,7 @@
         overlayPaths = map fullPath (attrNames (readDir overlayDir));
       in pathsToImportedAttrs overlayPaths;
 
-      packages.x86_64-linux = {
-        inherit (pkgs) sddm-chili dejavu_nerdfont purs pure;
-      };
+      packages.x86_64-linux = self.overlay pkgs pkgs;
 
       nixosModules = let
         # modules
diff --git a/pkgs/applications/display-managers/sddm/themes/chili/default.nix b/pkgs/applications/display-managers/sddm/themes/chili/default.nix
index 539f0e7a..a2a8c32a 100644
--- a/pkgs/applications/display-managers/sddm/themes/chili/default.nix
+++ b/pkgs/applications/display-managers/sddm/themes/chili/default.nix
@@ -2,6 +2,7 @@
 stdenv.mkDerivation rec {
   name = "sddm-chili";
   version = "0.5.5";
+
   src = fetchFromGitHub {
     owner = "MarianArlt";
     repo = "kde-plasma-chili";
diff --git a/pkgs/data/fonts/dejavu-nerdfont/default.nix b/pkgs/data/fonts/dejavu-nerdfont/default.nix
index c8b41a5e..ad0e4b9e 100644
--- a/pkgs/data/fonts/dejavu-nerdfont/default.nix
+++ b/pkgs/data/fonts/dejavu-nerdfont/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "dejavu-nerdfont-${version}";
+  pname = "dejavu-nerdfont";
   version = "2.0.0";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/libinih/default.nix b/pkgs/development/libraries/libinih/default.nix
index d9e31ac3..19b12e07 100644
--- a/pkgs/development/libraries/libinih/default.nix
+++ b/pkgs/development/libraries/libinih/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, fetchFromGitHub, ... }:
 
 stdenv.mkDerivation rec {
-  name = "libinih";
+  pname = "libinih";
   version = "r50";
 
   src = fetchFromGitHub {
@@ -17,4 +17,12 @@ stdenv.mkDerivation rec {
     -Ddefault_library=shared
     -Ddistro_install=true
   '';
+
+  meta = with stdenv.lib; {
+    description = "Simple .INI file parser in C";
+    homepage = "https://github.com/benhoyt/inih";
+    maintainers = [ maintainers.nrdxp ];
+    license = licenses.bsd3;
+    inherit version;
+  };
 }
diff --git a/pkgs/misc/drivers/wii-u-gc-adapter/default.nix b/pkgs/misc/drivers/wii-u-gc-adapter/default.nix
index 8c20d5d0..22b10371 100644
--- a/pkgs/misc/drivers/wii-u-gc-adapter/default.nix
+++ b/pkgs/misc/drivers/wii-u-gc-adapter/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, pkgconfig, libudev, libusb, ... }:
 
 stdenv.mkDerivation {
-  name = "wii-u-gc-adapter";
+  pname = "wii-u-gc-adapter";
+  version = "ae6b46d";
 
   buildInputs = [ pkgconfig libudev libusb ];
 
@@ -18,4 +19,12 @@ stdenv.mkDerivation {
   '';
 
   hardeningDisable = [ "format" ];
+
+  meta = with stdenv.lib; {
+    description = "Tool for using the Wii U GameCube Adapter on Linux";
+    homepage = "https://github.com/ToadKing/wii-u-gc-adapter";
+    maintainers = [ maintainers.nrdxp ];
+    license = licenses.mit;
+    inherit version;
+  };
 }
diff --git a/pkgs/os-specific/linux/gamemode/default.nix b/pkgs/os-specific/linux/gamemode/default.nix
index 4375472c..daf718b4 100644
--- a/pkgs/os-specific/linux/gamemode/default.nix
+++ b/pkgs/os-specific/linux/gamemode/default.nix
@@ -29,4 +29,11 @@ stdenv.mkDerivation rec {
     -Dwith-systemd-user-unit-dir=${placeholder "out"}/lib/systemd/user
   '';
 
+  meta = with stdenv.lib; {
+    description = "Optimise Linux system performance on demand";
+    homepage = "https://github.com/FeralInteractive/gamemode";
+    maintainers = [ maintainers.nrdxp ];
+    license = licenses.bsd3;
+    inherit version;
+  };
 }
diff --git a/pkgs/shells/zsh/pure/default.nix b/pkgs/shells/zsh/pure/default.nix
index 2e8d142d..458f9c00 100644
--- a/pkgs/shells/zsh/pure/default.nix
+++ b/pkgs/shells/zsh/pure/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform }:
 
 stdenv.mkDerivation rec {
-  name = "pure-${version}";
+  pname = "pure";
   version = "0e87bd8";
 
   srcs = fetchFromGitHub {