From e67416f7e2685ab6136863f96545a1c22f8a23cd Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 16 Feb 2017 18:22:38 -0600
Subject: [PATCH] awesome-4.0: Add hicolor-icon-theme for theme support

Closes #22888.
---
 .../window-managers/awesome/default.nix       | 61 ++++++-------------
 1 file changed, 19 insertions(+), 42 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 9fa4d6a6d8e..0a1256d67a4 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -4,29 +4,17 @@
 , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
 , which, dbus, nettools, git, asciidoc, doxygen
 , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
-, libxkbcommon, xcbutilxrm
+, libxkbcommon, xcbutilxrm, hicolor_icon_theme
 }:
 
-let
-  version = "4.0";
-in with luaPackages;
-
-stdenv.mkDerivation rec {
+with luaPackages; stdenv.mkDerivation rec {
   name = "awesome-${version}";
-
+  version = "4.0";
   src = fetchurl {
     url    = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz";
     sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w";
   };
 
-  meta = with stdenv.lib; {
-    description = "Highly configurable, dynamic window manager for X";
-    homepage    = https://awesomewm.org/;
-    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lovek323 rasendubi ];
-    platforms   = platforms.linux;
-  };
-
   nativeBuildInputs = [
     asciidoc
     cmake
@@ -36,33 +24,14 @@ stdenv.mkDerivation rec {
     pkgconfig
     xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
   ];
-
-  buildInputs = [
-    cairo
-    dbus
-    gdk_pixbuf
-    gobjectIntrospection
-    git
-    lgi
-    libpthreadstubs
-    libstartup_notification
-    libxdg_basedir
-    lua
-    nettools
-    pango
-    xcb-util-cursor
-    xorg.libXau
-    xorg.libXdmcp
-    xorg.libxcb
-    xorg.libxshmfence
-    xorg.xcbutil
-    xorg.xcbutilimage
-    xorg.xcbutilkeysyms
-    xorg.xcbutilrenderutil
-    xorg.xcbutilwm
-    libxkbcommon
-    xcbutilxrm
-  ];
+  propagatedUserEnvPkgs = [ hicolor_icon_theme ];
+  buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection
+                  git lgi libpthreadstubs libstartup_notification
+                  libxdg_basedir lua nettools pango xcb-util-cursor
+                  xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
+                  xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
+                  xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
+                  xcbutilxrm ];
 
   #cmakeFlags = "-DGENERATE_MANPAGES=ON";
 
@@ -86,4 +55,12 @@ stdenv.mkDerivation rec {
   passthru = {
     inherit lua;
   };
+
+  meta = with stdenv.lib; {
+    description = "Highly configurable, dynamic window manager for X";
+    homepage    = https://awesomewm.org/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 rasendubi ndowens ];
+    platforms   = platforms.linux;
+  };
 }