Merge pull request #34468 from grwlf/xfce4-weather

Fix and update xfce4-panel weather plugin

authored by

Jörg Thalheim and committed by
GitHub
a42cea1a 2d6d52b6

+5 -4
+3 -2
pkgs/desktops/xfce/core/xfce4-panel.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui 2 2 , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification 3 3 , makeWrapper, xfce4mixer, hicolor_icon_theme 4 - , withGtk3 ? false, gtk3, gettext 4 + , withGtk3 ? false, gtk3, gettext, glib_networking 5 5 }: 6 6 let 7 7 inherit (stdenv.lib) optional; ··· 40 40 41 41 postInstall = '' 42 42 wrapProgram "$out/bin/xfce4-panel" \ 43 - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" 43 + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ 44 + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" 44 45 ''; 45 46 46 47 enableParallelBuilding = true;
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
··· 5 5 name = "${p_name}-${ver_maj}.${ver_min}"; 6 6 p_name = "xfce4-weather-plugin"; 7 7 ver_maj = "0.8"; 8 - ver_min = "7"; 8 + ver_min = "10"; 9 9 10 10 src = fetchurl { 11 11 url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; 12 - sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7"; 12 + sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf"; 13 13 }; 14 14 15 15 nativeBuildInputs = [ pkgconfig intltool ];