From b07de4c7c2524c615ce8040f197982c0efb82cb2 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 21 Jul 2018 21:00:53 +0000
Subject: [PATCH 1/2] xfce4-13.xfce4-battery-plugin: init at 1.1.0

---
 pkgs/desktops/xfce4-13/default.nix                    |  2 ++
 pkgs/desktops/xfce4-13/mkXfceDerivation.nix           |  9 +++++----
 .../xfce4-13/xfce4-battery-plugin/default.nix         | 11 +++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix

diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix
index 6db207a79c56..9989ebed4bce 100644
--- a/pkgs/desktops/xfce4-13/default.nix
+++ b/pkgs/desktops/xfce4-13/default.nix
@@ -44,6 +44,8 @@ makeScope newScope (self: with self; {
 
   xfce4-appfinder = callPackage ./xfce4-appfinder { };
 
+  xfce4-battery-plugin = callPackage ./xfce4-battery-plugin { };
+
   xfce4-dev-tools = callPackage ./xfce4-dev-tools {
     mkXfceDerivation = mkXfceDerivation.override {
       xfce4-dev-tools = null;
diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
index f08272e9db07..1c0847874f5f 100644
--- a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
+++ b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools ? null }:
+{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools }:
 
-{ category, pname, sha256 ? null, version, ... } @ args:
+{ category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args:
 
 let
   inherit (builtins) filter getAttr head isList;
@@ -20,13 +20,14 @@ let
 
     src = fetchgit {
       url = "git://git.xfce.org/${category}/${pname}";
-      rev = name;
-      inherit sha256;
+      inherit rev sha256;
     };
 
     enableParallelBuilding = true;
     outputs = [ "out" "dev" ];
 
+    preFixup = ''rm $out/share/icons/hicolor/icon-theme.cache || true'';
+
     meta = with stdenv.lib; {
       homepage = "https://git.xfce.org/${category}/${pname}/about";
       license = licenses.gpl2; # some libraries are under LGPLv2+
diff --git a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
new file mode 100644
index 000000000000..b4b5ff7b7148
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
@@ -0,0 +1,11 @@
+{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+
+mkXfceDerivation rec {
+  category = "panel-plugins";
+  pname = "xfce4-battery-plugin";
+  version = "1.1.0";
+  rev = version;
+  sha256 = "0mz0lj3wjrsj9n4wcqrvv08430g38nkjbdimxdy8316n6bqgngfn";
+
+  buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
+}

From e87a1a518268f76d159060ab27442f3db0c991b1 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 21 Jul 2018 21:07:49 +0000
Subject: [PATCH 2/2] mkXfceDerivation: use hicolor-icon-theme's setup-hook

---
 pkgs/desktops/xfce4-13/mkXfceDerivation.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
index 1c0847874f5f..da7179c46462 100644
--- a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
+++ b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools }:
+{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme }:
 
 { category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args:
 
@@ -16,6 +16,7 @@ let
     name = "${pname}-${version}";
 
     nativeBuildInputs = [ pkgconfig xfce4-dev-tools ];
+    buildInputs = [ hicolor-icon-theme ];
     configureFlags = [ "--enable-maintainer-mode" ];
 
     src = fetchgit {
@@ -26,8 +27,6 @@ let
     enableParallelBuilding = true;
     outputs = [ "out" "dev" ];
 
-    preFixup = ''rm $out/share/icons/hicolor/icon-theme.cache || true'';
-
     meta = with stdenv.lib; {
       homepage = "https://git.xfce.org/${category}/${pname}/about";
       license = licenses.gpl2; # some libraries are under LGPLv2+