From 87451cc113b9ea9372f58a41182381f64367a44c Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Wed, 31 Jan 2018 22:10:21 +0300
Subject: xfce4-weather-plugin 0.8.7 -> 0.8.10; add glib_networking

---
 pkgs/desktops/xfce/core/xfce4-panel.nix                   | 5 +++--
 pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index e91a3ab25ee90..e9f6240cbdfe3 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
 , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
 , makeWrapper, xfce4mixer, hicolor_icon_theme
-, withGtk3 ? false, gtk3, gettext
+, withGtk3 ? false, gtk3, gettext, glib_networking
 }:
 let
   inherit (stdenv.lib) optional;
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/xfce4-panel" \
-      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
index 419efbcbf95aa..0af0e62244fd3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
@@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
   p_name  = "xfce4-weather-plugin";
   ver_maj = "0.8";
-  ver_min = "7";
+  ver_min = "10";
 
   src = fetchurl {
     url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7";
+    sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-- 
cgit 1.4.1