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

xfce: more update fallout

Browse Source 
- forgotten mousepad update, including some wrapping magic
- dealing with panel plugins (either fix or mark as broken)
	CC maintainer @AndersonTorres.
- remove some libxfcegui4 occurrences, as it's being phased out
- minor stuff
This commit is contained in:
Vladimír Čunát 2015-03-12 22:52:38 +01:00
parent 9567ba4601
commit 208d1f24db
9 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -46,7 +46,6 @@ in
pkgs.which # Needed by the xfce's xinitrc script.
pkgs.xfce.exo
pkgs.xfce.gtk_xfce_engine
pkgs.xfce.libxfcegui4 # For the icons.
pkgs.xfce.mousepad
pkgs.xfce.ristretto
pkgs.xfce.terminal

20
pkgs/desktops/xfce/applications/mousepad.nix
View File

@ -1,29 +1,31 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4
, gtk, gtksourceview, dbus, dbus_glib }:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util
, gtk, gtksourceview, dbus, dbus_glib, makeWrapper }:
stdenv.mkDerivation rec {
p_name = "mousepad";
ver_maj = "0.3";
ver_maj = "0.4";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh";
sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool libxfce4util libxfcegui4
gtk gtksourceview dbus dbus_glib
[ pkgconfig intltool libxfce4util
gtk gtksourceview dbus dbus_glib makeWrapper
];
# Propagate gtksourceview into $XDG_DATA_DIRS to provide syntax
# highlighting (in fact Mousepad segfaults without it).
propagatedUserEnvPkgs = [ gtksourceview ];
preFixup = ''
wrapProgram "$out/bin/mousepad" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share"
'';
meta = {
homepage = http://www.xfce.org/;
description = "A simple text editor for Xfce";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
p_name = "gtk-xfce-engine";
ver_maj = "2.10";
ver_min = "0";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0rqrnjxx1lzla7wp2fadyixs6jy0js6xh005pgwyqbigpl0v7hy1";
sha256 = "4a92910205881f707f2cc8d3c9b00a95feb58eb9084d932c841f3ed027f7063d";
};
name = "${p_name}-${ver_maj}.${ver_min}";

6
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
View File

@ -3,12 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
p_name = "xfce4-cpufreq-plugin";
ver_maj = "1.0";
ver_min = "0";
ver_maj = "1.1";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1";
sha256 = "1ryaynkxpqpp92pj18bdds869sf560ir1k3bgl8gqnz60z04ak27";
};
name = "${p_name}-${ver_maj}.${ver_min}";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {

1
pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
View File

@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
description = "Dictionary plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
broken = true; # see http://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin
};
}

1
pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
View File

@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
description = "Sticky notes plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
broken = true;
};
}

8
pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre
, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }:
with stdenv.lib;
stdenv.mkDerivation rec {
p_name = "xfce4-verve-plugin";
ver_maj = "1.0";
ver_min = "0";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "18zi8lam82xwjm5zdnilg3ffxpp5z8vjad3kjvdsyxdhsdza84fh";
sha256 = "1y4vvk3nk1haq39xw0gzscsnnj059am1p3acgq9mj0miyiz8971v";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

4
pkgs/top-level/all-packages.nix
View File

@ -12962,8 +12962,8 @@ let
kde5 = kf5_stable // plasma5_stable // kdeApps_stable;
xfce = xfce4_10;
xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });
xfce = xfce4-12;
xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });
xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };