dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #34468 from grwlf/xfce4-weather

Browse Source 
Fix and update xfce4-panel weather plugin
This commit is contained in:
Jörg Thalheim 2018-02-11 11:56:53 +00:00 committed by GitHub
commit a42cea1a65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/xfce/core/xfce4-panel.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
, makeWrapper, xfce4mixer, hicolor_icon_theme , makeWrapper, xfce4mixer, hicolor_icon_theme
, withGtk3 ? false, gtk3, gettext , withGtk3 ? false, gtk3, gettext, glib_networking
}: }:
let let
inherit (stdenv.lib) optional; inherit (stdenv.lib) optional;
@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram "$out/bin/xfce4-panel" \ 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; enableParallelBuilding = true;

4
pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
View File

@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}"; name = "${p_name}-${ver_maj}.${ver_min}";
p_name = "xfce4-weather-plugin"; p_name = "xfce4-weather-plugin";
ver_maj = "0.8"; ver_maj = "0.8";
ver_min = "7"; ver_min = "10";
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7"; sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];