diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-11 11:56:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 11:56:53 +0000 |
| commit | a42cea1a656feb901635f0735c1d9251becdb33d (patch) | |
| tree | 54e6f85b585b29eba904ff4697e4be1f61bbc584 /pkgs | |
| parent | 2d6d52b60c3cddfbe2b8fac1ceb221ff53f8ef4f (diff) | |
| parent | 87451cc113b9ea9372f58a41182381f64367a44c (diff) | |
| download | nixpkgs-a42cea1a656feb901635f0735c1d9251becdb33d.tar nixpkgs-a42cea1a656feb901635f0735c1d9251becdb33d.tar.gz nixpkgs-a42cea1a656feb901635f0735c1d9251becdb33d.tar.bz2 nixpkgs-a42cea1a656feb901635f0735c1d9251becdb33d.tar.lz nixpkgs-a42cea1a656feb901635f0735c1d9251becdb33d.tar.xz nixpkgs-a42cea1a656feb901635f0735c1d9251becdb33d.tar.zst nixpkgs-a42cea1a656feb901635f0735c1d9251becdb33d.zip | |
Merge pull request #34468 from grwlf/xfce4-weather
Fix and update xfce4-panel weather plugin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/xfce/core/xfce4-panel.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e91a3ab25ee..e9f6240cbdf 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 419efbcbf95..0af0e62244f 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 ]; |