xfce4-14: move to xfce and have only one version of xfce

All code that was at xfce4-14 has been moved to xfce/*.
Old expressions that aren't rewritten might be abandoned or broken.

Additonally I've ported the xfce4-14 thunar expression to support
thunarPlugins. We can now support this interface in the Xfce module
again, although I'm not sure if we have any plugins packaged that support
latest thunar.
This commit is contained in:
worldofpeace 2019-11-04 16:27:22 -05:00
parent 041d35a08a
commit ac70cd728c
107 changed files with 328 additions and 1726 deletions

View file

@ -1,22 +0,0 @@
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs }:
stdenv.mkDerivation rec {
p_name = "gigolo";
ver_maj = "0.4";
ver_min = "2";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0r4ij0mlnp0bqq44pyrdcpz18r1zwsksw6w5yc0jzgg7wj7wfgsm";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ python gettext intltool gtk gvfs];
meta = {
homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
description = "A frontend to easily manage connections to remote filesystems";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -9,4 +9,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 glib gvfs ];
meta = {
description = "A frontend to easily manage connections to remote filesystems";
};
}

View file

@ -1,90 +0,0 @@
diff -urNZ a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c
--- a/mousepad/mousepad-action-group.c 2014-09-01 20:50:07.000000000 +0000
+++ b/mousepad/mousepad-action-group.c 2017-12-18 16:57:46.836538403 +0000
@@ -302,11 +302,6 @@
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
self->locked = FALSE;
- /* update the setting when the active action is changed */
- self->locked = TRUE;
- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme));
- self->locked = FALSE;
-
g_object_notify (G_OBJECT (self), "active-style-scheme");
}
@@ -473,6 +468,8 @@
mousepad_action_group_style_scheme_action_activate (MousepadActionGroup *self,
MousepadStyleSchemeAction *action)
{
+ const gchar *scheme_name = NULL;
+
/* only update the active action if we're not already in the process of
* setting it and the sender action is actually active */
if (! self->locked &&
@@ -481,7 +478,14 @@
GtkSourceStyleScheme *scheme;
scheme = mousepad_style_scheme_action_get_style_scheme (action);
- mousepad_action_group_set_active_style_scheme (self, scheme);
+
+ /* update the setting when the active action is changed */
+ if (scheme != NULL)
+ scheme_name = gtk_source_style_scheme_get_id(scheme);
+
+ self->locked = TRUE;
+ MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name);
+ self->locked = FALSE;
}
}
diff -urNZ a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
--- a/mousepad/mousepad-window.c 2014-09-01 20:58:02.000000000 +0000
+++ b/mousepad/mousepad-window.c 2017-12-18 17:07:51.099321408 +0000
@@ -712,32 +712,6 @@
static void
-mousepad_window_action_group_style_scheme_changed (MousepadWindow *window,
- GParamSpec *pspec,
- MousepadActionGroup *group)
-{
- GtkSourceStyleScheme *scheme;
- const gchar *scheme_id;
- gint npages, i;
-
- /* get the new active language */
- scheme = mousepad_action_group_get_active_style_scheme (group);
- scheme_id = gtk_source_style_scheme_get_id (scheme);
-
- /* update the color scheme on all the documents */
- npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook));
- for (i = 0; i < npages; i++)
- {
- MousepadDocument *document;
-
- document = MOUSEPAD_DOCUMENT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (window->notebook), i));
- mousepad_view_set_color_scheme (document->textview, scheme_id);
- }
-}
-
-
-
-static void
mousepad_window_create_style_schemes_menu (MousepadWindow *window)
{
GtkWidget *menu, *item;
@@ -751,13 +725,6 @@
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
gtk_widget_show_all (menu);
gtk_widget_show (item);
-
- /* watch for activations of the style schemes actions */
- g_signal_connect_object (window->action_group,
- "notify::active-style-scheme",
- G_CALLBACK (mousepad_window_action_group_style_scheme_changed),
- window,
- G_CONNECT_SWAPPED);
}

View file

@ -1,38 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util
, gtk, gtksourceview, dbus, dbus-glib, makeWrapper
, dconf }:
stdenv.mkDerivation rec {
p_name = "mousepad";
ver_maj = "0.4";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132";
};
name = "${p_name}-${ver_maj}.${ver_min}";
patches = [ ./mousepad-12134.patch ];
buildInputs =
[ pkgconfig intltool libxfce4util
gtk gtksourceview dbus dbus-glib makeWrapper
dconf
];
configureFlags = [ "--enable-keyfile-settings" ];
preFixup = ''
wrapProgram "$out/bin/mousepad" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
'';
meta = {
homepage = https://www.xfce.org/;
description = "A simple text editor for Xfce";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -12,4 +12,8 @@ mkXfceDerivation {
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
meta = {
description = "A simple text editor for Xfce";
};
}

View file

@ -1,44 +0,0 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
, libnotify, popt, xfce }:
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
p_name = "orage";
ver_maj = "4.12";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w";
};
patches = [
# Fix build with libical 3.0
(fetchpatch {
name = "fix-libical3.patch";
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f;
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
})
];
postPatch = ''
substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
'';
postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
nativeBuildInputs = [ pkgconfig intltool bison flex ];
buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
xfce.xfce4-panel ];
meta = {
homepage = https://www.xfce.org/projects/;
description = "A simple calendar application with reminders";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ];
};
}

View file

@ -32,4 +32,8 @@ mkXfceDerivation {
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
})
];
meta = {
description = "A simple calendar application with reminders";
};
}

View file

@ -1,38 +0,0 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1
, gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf
, taglib, libnotify, hicolor-icon-theme
, withGstPlugins ? true
}:
stdenv.mkDerivation rec {
p_name = "parole";
ver_maj = "0.5";
ver_min = "4";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1hxzqg9dfghrhvmnnccwwa4278fh2awkcqy89sla05m08mxvvx60";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
makeWrapper hicolor-icon-theme
gtk dbus-glib libxfce4ui libxfce4util xfconf
taglib libnotify
] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]);
configureFlags = [ "--with-gstreamer=1.0" ];
postInstall = stdenv.lib.optionalString withGstPlugins ''
wrapProgram "$out/bin/parole" --prefix \
GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
meta = {
homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
description = "Modern simple media player";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,6 +1,5 @@
{ mkXfceDerivation, dbus, dbus-glib
, gst-plugins-bad, gst-plugins-base, gst-plugins-good
, gst-plugins-ugly, gtk3, libnotify, libxfce4ui, libxfce4util
, gst_all_1, gtk3, libnotify, libxfce4ui, libxfce4util
, taglib, xfconf }:
# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
@ -17,7 +16,7 @@ mkXfceDerivation {
--replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
'';
buildInputs = [
buildInputs = with gst_all_1; [
dbus
dbus-glib
gst-plugins-bad
@ -31,4 +30,8 @@ mkXfceDerivation {
taglib
xfconf
];
meta = {
description = "Modern simple media player";
};
}

View file

@ -1,34 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk
, exo, dbus-glib, libxfce4util, libxfce4ui, xfconf
, hicolor-icon-theme, makeWrapper
}:
stdenv.mkDerivation rec {
p_name = "ristretto";
ver_maj = "0.6";
ver_min = "3";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0y9d8w1plwp4vmxs44y8k8x15i0k0xln89k6jndhv6lf57g1cs1b";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool libexif gtk dbus-glib exo libxfce4util
libxfce4ui xfconf hicolor-icon-theme makeWrapper
];
postInstall = ''
wrapProgram "$out/bin/ristretto" \
--prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"
'';
meta = {
homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

View file

@ -10,4 +10,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];
meta = {
description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
};
}

View file

@ -1,25 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus-glib
, exo, libxfce4util, libxfce4ui
}:
stdenv.mkDerivation rec {
p_name = "xfce4-terminal";
ver_maj = "0.6";
ver_min = "3";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "023y0lkfijifh05yz8grimxadqpi98mrivr00sl18nirq8b4fbwi";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ];
meta = {
homepage = https://www.xfce.org/projects/terminal;
description = "A modern terminal emulator primarily for the Xfce desktop environment";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -16,4 +16,8 @@ mkXfceDerivation {
'';
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ];
meta = {
description = "A Dictionary Client for the Xfce desktop environment";
};
}

View file

@ -1,51 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper
, glib, gstreamer, gst-plugins-base, gtk
, libxfce4util, libxfce4ui, xfce4-panel, xfconf, libunique ? null
, pulseaudioSupport ? false, gst-plugins-good
}:
let
# The usual Gstreamer plugins package has a zillion dependencies
# that we don't need for a simple mixer, so build a minimal package.
gst_plugins_minimal = gst-plugins-base.override {
minimalDeps = true;
};
gst_plugins_pulse = gst-plugins-good.override {
minimalDeps = true;
};
gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse;
in
stdenv.mkDerivation rec {
p_name = "xfce4-mixer";
ver_maj = "4.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1pnsd00583l7p5d80rxbh58brzy3jnccwikbbbm730a33c08kid8";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool glib gstreamer gtk
libxfce4util libxfce4ui xfce4-panel xfconf libunique makeWrapper
] ++ gst_plugins;
postInstall =
''
wrapProgram "$out/bin/xfce4-mixer" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
'';
passthru = { inherit gst_plugins; };
meta = {
homepage = https://www.xfce.org/projects/xfce4-mixer; # referenced but inactive
description = "A volume control application for the Xfce desktop environment";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

View file

@ -1,32 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, libnotify
, gtk , libxfce4util, libxfce4ui, xfconf, hicolor-icon-theme }:
stdenv.mkDerivation rec {
p_name = "xfce4-notifyd";
ver_maj = "0.2";
ver_min = "4";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1l6fpfk0fkizdx7vwbyjdyzzj5i2ng8pf7r8j49nv0cnjhpxczlc";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf hicolor-icon-theme ];
preFixup = ''
# to be able to run the daemon we need it in PATH
ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin
'';
doCheck = true;
meta = {
homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
description = "Notification daemon for Xfce";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

View file

@ -9,4 +9,8 @@ mkXfceDerivation {
sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";
buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
meta = {
description = "Simple notification daemon for Xfce";
};
}

View file

@ -1,29 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup
, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
p_name = "xfce4-screenshooter";
ver_maj = "1.8";
ver_min = "2";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "9dce2ddfaa87f703e870e29bae13f3fc82a1b3f06b44f8386640e45a135f5f69";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [
pkgconfig intltool wrapGAppsHook
];
buildInputs = [
xfce4-panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking
];
meta = {
homepage = https://goodies.xfce.org/projects/applications/xfce4-screenshooter;
description = "Xfce screenshooter";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -8,4 +8,8 @@ mkXfceDerivation {
sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
meta = {
description = "Screenshot utility for the Xfce desktop";
};
}

View file

@ -1,22 +0,0 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libwnck }:
stdenv.mkDerivation rec {
p_name = "xfce4-taskmanager";
ver_maj = "1.1";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1jwywmkkkmz7406m1jq40w6apiav25cznafhigbgpjv6z5hv27if";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk libwnck ];
meta = {
homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
description = "Easy to use task manager for Xfce";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -9,4 +9,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 libwnck3 libXmu ];
meta = {
description = "Easy to use task manager for Xfce";
};
}

View file

@ -1,31 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libpulseaudio
, gtk2, libnotify
, keybinder, xfconf
}:
stdenv.mkDerivation rec {
p_name = "xfce4-volumed-pulse";
ver_maj = "0.2";
ver_min = "2";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0xjcs1b6ix6rwj9xgr9n89h315r3yhdm8wh5bkincd4lhz6ibhqf";
};
buildInputs =
[ libpulseaudio gtk2
keybinder xfconf libnotify
];
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {
homepage = https://launchpad.net/xfce4-volumed-pulse;
description = "A volume keys control daemon for the Xfce desktop environment (Xubuntu fork)";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.abbradar ];
};
}

View file

@ -10,6 +10,8 @@ mkXfceDerivation {
buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ];
meta = with lib; {
description = "A volume keys control daemon for Xfce using pulseaudio";
license = licenses.gpl3Plus;
maintainers = [ maintainers.abbradar ];
};
}

View file

@ -1,27 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util
, hicolor-icon-theme }:
stdenv.mkDerivation rec {
p_name = "exo";
ver_maj = "0.10";
ver_min = "7";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c";
};
name = "${p_name}-${ver_maj}.${ver_min}";
outputs = [ "out" "dev" "devdoc" ];
# lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ];
meta = with stdenv.lib; {
homepage = "https://docs.xfce.org/xfce/${p_name}/start";
description = "Application library for the Xfce desktop environment";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

View file

@ -1,14 +0,0 @@
diff -urNZ a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
--- a/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:22:33.551926068 +0000
+++ b/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:23:33.055497211 +0000
@@ -676,6 +676,9 @@
G_CALLBACK (garcon_gtk_menu_deactivate), menu);
gtk_widget_show (mi);
+ /* submenu are child items, too. */
+ has_children = TRUE;
+
if (menu->priv->show_menu_icons)
{
icon_name = garcon_menu_element_get_icon_name (li->data);
Binary files a/.git/index and b/.git/index differ

View file

@ -1,44 +0,0 @@
From 222080e6d5fce85eb2a8a5c33df671bd9f21add8 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Thu, 14 Dec 2017 22:04:04 +0000
Subject: [PATCH] Decrement allocation counter on item unref (#12700)
---
garcon/garcon-menu-item-pool.c | 7 ++++++-
garcon/garcon-menu-item.c | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
index 2017180..355e520 100644
--- a/garcon/garcon-menu-item-pool.c
+++ b/garcon/garcon-menu-item-pool.c
@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id,
g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
g_return_val_if_fail (node != NULL, FALSE);
- return garcon_menu_node_tree_rule_matches (node, item);
+ gboolean matches = garcon_menu_node_tree_rule_matches (node, item);
+
+ if (matches)
+ garcon_menu_item_increment_allocated (item);
+
+ return matches;
}
diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
index 66a86bf..d61c88f 100644
--- a/garcon/garcon-menu-item.c
+++ b/garcon/garcon-menu-item.c
@@ -1516,6 +1516,8 @@ garcon_menu_item_unref (GarconMenuItem *item)
{
g_return_if_fail (GARCON_IS_MENU_ITEM (item));
+ garcon_menu_item_decrement_allocated (item);
+
/* Decrement the reference counter */
g_object_unref (G_OBJECT (item));
}
--
2.15.1

View file

@ -1,27 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }:
let
p_name = "garcon";
ver_maj = "0.4";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq";
};
outputs = [ "out" "dev" ];
patches = [ ./garcon-10967.patch ./garcon-12700.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ];
meta = with stdenv.lib; {
homepage = https://www.xfce.org/;
description = "Xfce menu support library";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

View file

@ -8,4 +8,8 @@ mkXfceDerivation {
sha256 = "0pamhp1wffiw638s66nws2mpzmwkhvhb6iwccfy8b0kyr57wipjv";
buildInputs = [ gtk3 libxfce4ui libxfce4util ];
meta = {
description = "Xfce menu support library";
};
}

View file

@ -1,31 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, withGtk3 ? false, gtk3 ? null }:
assert withGtk3 -> (gtk3 != null);
stdenv.mkDerivation rec {
p_name = "gtk-xfce-engine";
ver_maj = "3.2";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1va71f3gpl8gikfkmqsd5ikgp7qj8b64jii2l98g1ylnv8xrqp47";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk2 ] ++ stdenv.lib.optional withGtk3 gtk3;
# `glib-mkenums' is unhappy that some source files are not valid UTF-8
postPatch = ''find . -type f -name '*.[ch]' -exec sed -r -i 's/\xD6/O/g' {} +'';
configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
meta = {
homepage = https://www.xfce.org/;
description = "GTK theme engine for Xfce";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

View file

@ -1,41 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf
, libglade, libstartup_notification, hicolor-icon-theme
, withGtk3 ? false, gtk3
}:
let
p_name = "libxfce4ui";
ver_maj = "4.12";
ver_min = "1";
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
};
outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs =
[ gtk libxfce4util xfconf libglade
libstartup_notification hicolor-icon-theme
] ++ optional withGtk3 gtk3;
propagatedBuildInputs = [ xorg.libICE xorg.libSM ];
#TODO: glade?
configureFlags = optional withGtk3 "--enable-gtk3";
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://www.xfce.org/;
description = "Basic GUI library for Xfce";
license = licenses.lgpl2Plus;
platforms = platforms.linux;
};
}

View file

@ -1,26 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool }:
let
p_name = "libxfce4util";
ver_maj = "4.12";
ver_min = "1";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7";
};
outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib intltool ];
meta = {
homepage = https://www.xfce.org/;
description = "Basic utility non-GUI functions for Xfce";
license = "bsd";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,37 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk
, libxfce4util, xfconf, libglade, libstartup_notification, hicolor-icon-theme }:
let
p_name = "libxfcegui4";
ver_maj = "4.10";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
};
outputs = [ "out" "dev" "devdoc" ];
#TODO: gladeui
# By default, libxfcegui4 tries to install into libglade's prefix.
# Install into our own prefix instead.
configureFlags = [
"--with-libglade-module-path=$(out)/lib/libglade/2.0"
];
#NOTE: missing keyboard library support is OK according to the mailing-list
buildInputs =
[ pkgconfig intltool gtk libxfce4util xfconf libglade
libstartup_notification hicolor-icon-theme
];
meta = {
homepage = https://www.xfce.org/;
description = "Basic GUI library for Xfce";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,42 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool
, gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev
, exo, libxfce4util, xfconf, xfce4-panel, hicolor-icon-theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
p_name = "thunar";
ver_maj = "1.6";
ver_min = "10";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";
sha256 = "7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a";
};
name = "${p_name}-build-${ver_maj}.${ver_min}";
patches = [ ./thunarx_plugins_directory.patch ];
postPatch = ''
sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
'';
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [
intltool
gtk dbus-glib libstartup_notification libnotify libexif pcre udev
exo libxfce4util xfconf xfce4-panel
hicolor-icon-theme
];
# TODO: optionality?
enableParallelBuilding = true;
meta = {
homepage = http://thunar.xfce.org/;
description = "Xfce file manager";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

View file

@ -1,30 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
, xfconf, udev, libgudev, libnotify, hicolor-icon-theme }:
stdenv.mkDerivation rec {
p_name = "thunar-volman";
ver_maj = "0.8";
ver_min = "1";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1gf259n1v3y23n1zlkhyr6r0i8j59rnl1cmxvxj6la9cwdfbn22s";
};
buildInputs =
[ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util
xfconf libnotify hicolor-icon-theme
];
enableParallelBuilding = true;
meta = {
homepage = https://goodies.xfce.org/projects/thunar-plugins/thunar-volman;
description = "Thunar extension for automatic management of removable drives and media";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

View file

@ -8,4 +8,8 @@ mkXfceDerivation {
buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0";
meta = {
description = "Thunar extension for automatic management of removable drives and media";
};
}

View file

@ -1,68 +0,0 @@
{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-bare
, thunarPlugins ? []
}:
with stdenv.lib;
let
build = thunar-bare;
replaceLnExeListWithWrapped = exeDir: exeNameList: mkWrapArgs: ''
exeDir="${exeDir}"
oriDir=`realpath -e "$exeDir"`
unlink "$exeDir"
mkdir -p "$exeDir"
lndir "$oriDir" "$exeDir"
exeList="${concatStrings (intersperse " " (map (x: "${exeDir}/${x}") exeNameList))}"
for exe in $exeList; do
oriExe=`realpath -e "$exe"`
rm -f "$exe"
makeWrapper "$oriExe" "$exe" ${concatStrings (intersperse " " mkWrapArgs)}
done
'';
name = "${build.p_name}-${build.ver_maj}.${build.ver_min}";
meta = {
inherit (build.meta) homepage license platforms;
description = build.meta.description + optionalString
(0 != length thunarPlugins)
" (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
maintainers = build.meta.maintainers /*++ [ jraygauthier ]*/;
};
in
# TODO: To be replaced with `buildEnv` awaiting missing features.
runCommand name {
inherit build;
inherit meta;
nativeBuildInputs = [ makeWrapper lndir ];
dontPatchELF = true;
dontStrip = true;
}
(let
buildWithPlugins = buildEnv {
name = "thunar-bare-with-plugins";
paths = [ build ] ++ thunarPlugins;
};
in ''
mkdir -p $out
pushd ${buildWithPlugins} > /dev/null
for d in `find . -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do
ln -s "${buildWithPlugins}/$d" "$out/$d"
done
popd > /dev/null
${replaceLnExeListWithWrapped "$out/bin" [ "thunar" "thunar-settings" ] [
"--set THUNARX_MODULE_DIR \"${buildWithPlugins}/lib/thunarx-2\""
]}
'')

View file

@ -0,0 +1,70 @@
{ mkXfceDerivation
, lib
, docbook_xsl
, exo
, gdk-pixbuf
, gtk3
, libgudev
, libnotify
, libX11
, libxfce4ui
, libxfce4util
, libxslt
, xfconf
, gobject-introspection
, gvfs
, makeWrapper
, symlinkJoin
, thunarPlugins ? []
}:
let unwrapped = mkXfceDerivation {
category = "xfce";
pname = "thunar";
version = "1.8.9";
sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w";
nativeBuildInputs = [
docbook_xsl
gobject-introspection
libxslt
];
buildInputs = [
exo
gdk-pixbuf
gtk3
gvfs
libX11
libgudev
libnotify
libxfce4ui
libxfce4util
xfconf
];
patches = [
./thunarx_plugins_directory.patch
];
# the desktop file … is in an insecure location»
# which pops up when invoking desktop files that are
# symlinks to the /nix/store
#
# this error was added by this commit:
# https://github.com/xfce-mirror/thunar/commit/1ec8ff89ec5a3314fcd6a57f1475654ddecc9875
postPatch = ''
sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
'';
meta = {
description = "Xfce file manager";
};
};
in if thunarPlugins == [] then unwrapped
else import ./wrapper.nix {
inherit makeWrapper symlinkJoin thunarPlugins lib;
thunar = unwrapped;
}

View file

@ -1,8 +1,8 @@
diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c
index 31b8835..a3e7f4e 100644
index 94b11545..1f66c982 100644
--- a/thunarx/thunarx-provider-factory.c
+++ b/thunarx/thunarx-provider-factory.c
@@ -141,12 +141,19 @@ static GList*
@@ -150,12 +150,19 @@ static GList*
thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory)
{
ThunarxProviderModule *module;
@ -24,7 +24,7 @@ index 31b8835..a3e7f4e 100644
{
/* determine the types for all existing plugins */
diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c
index 023ad2a..6c21997 100644
index 023ad2ae..b1d1be8f 100644
--- a/thunarx/thunarx-provider-module.c
+++ b/thunarx/thunarx-provider-module.c
@@ -174,10 +174,17 @@ static gboolean
@ -33,13 +33,13 @@ index 023ad2a..6c21997 100644
ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module);
+ const gchar *thunar_dir;
gchar *path;
+
+ thunar_dir = g_getenv("THUNARX_MODULE_DIR");
+ if (NULL == thunar_dir)
+ {
+ thunar_dir = THUNARX_DIRECTORY;
+ }
+
/* load the module using the runtime link editor */
- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL);
+ path = g_build_filename (thunar_dir, type_module->name, NULL);

View file

@ -0,0 +1,34 @@
{ makeWrapper, symlinkJoin, thunar, thunarPlugins, lib }:
symlinkJoin {
name = "thunar-with-plugins-${thunar.version}";
paths = [ thunar ] ++ thunarPlugins;
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram "$out/bin/thunar" \
--set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3"
wrapProgram "$out/bin/thunar-settings" \
--set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3"
for file in "lib/systemd/user/thunar.service" "share/dbus-1/services/org.xfce.FileManager.service" \
"share/dbus-1/services/org.xfce.Thunar.FileManager1.service" \
"share/dbus-1/services/org.xfce.Thunar.service"
do
rm -f "$out/$file"
substitute "${thunar}/$file" "$out/$file" \
--replace "${thunar}" "$out"
done
'';
meta = with lib; {
inherit (thunar.meta) homepage license platforms maintainers;
description = thunar.meta.description + optionalString
(0 != length thunarPlugins)
" (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
};
}

View file

@ -1,42 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk-pixbuf, curl, freetype
, libgsf, poppler, bzip2 }:
let
p_name = "tumbler";
ver_maj = "0.1";
ver_min = "31";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh";
};
outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
intltool dbus-glib gdk-pixbuf curl freetype
poppler libgsf bzip2
];
configureFlags = [
# Needs gst-tag
# "--enable-gstreamer-thumbnailer"
# Needs libffmpegthumbnailer
# "--enable-ffmpeg-thumbnailer"
"--enable-odf-thumbnailer"
"--enable-poppler-thumbnailer"
];
meta = with stdenv.lib; {
homepage = http://git.xfce.org/xfce/tumbler/;
description = "A D-Bus thumbnailer service";
platforms = platforms.linux;
license = licenses.gpl2;
};
}

View file

@ -32,4 +32,8 @@ mkXfceDerivation {
postFixup = ''
wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"
'';
meta = {
description = "A D-Bus thumbnailer service";
};
}

View file

@ -1,29 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util
, libxfce4ui, garcon, xfconf }:
let
p_name = "xfce4-appfinder";
ver_maj = "4.12";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a";
};
buildInputs =
[ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://docs.xfce.org/xfce/xfce4-appfinder/;
description = "Xfce application finder, a tool to locate and launch programs on your system";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

View file

@ -9,4 +9,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
meta = {
description = "Appfinder for the Xfce4 Desktop Environment";
};
}

View file

@ -1,28 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, autoconf, automake, libtool, intltool }:
let
p_name = "xfce4-dev-tools";
ver_maj = "4.12";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib ];
# not needed to build it but to use it
propagatedBuildInputs = [ autoconf automake libtool intltool ];
meta = {
homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/;
description = "Tools and M4 macros for Xfce4 developers";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,25 +0,0 @@
--- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100
+++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100
@@ -24,12 +24,19 @
PATH=/bin:/usr/bin
export PATH
-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
+# First test for the command set in the session's xfconf channel
+LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand)
+
+# Lock by xscreensaver, gnome-screensaver, or light-locker, if a respective daemon is running
for lock_cmd in \
+ "$LOCK_CMD" \
"xscreensaver-command -lock" \
- "gnome-screensaver-command --lock"
+ "gnome-screensaver-command --lock" \
+ "light-locker-command -l"
do
- $lock_cmd >/dev/null 2>&1 && exit
+ if [ ! -z "$lock_cmd" ]; then
+ $lock_cmd >/dev/null 2>&1 && exit
+ fi
done
# else run another access locking utility, if installed

View file

@ -1,59 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
, makeWrapper, xfce4-mixer, hicolor-icon-theme, tzdata
, withGtk3 ? false, gtk3, gettext, glib-networking
}:
let
inherit (stdenv.lib) optional;
p_name = "xfce4-panel";
ver_maj = "4.12";
ver_min = "2";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2";
};
patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1";
postPatch = ''
for f in $(find . -name \*.sh); do
substituteInPlace $f --replace gettext ${gettext}/bin/gettext
done
substituteInPlace plugins/clock/clock.c \
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
--replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" ""
'';
outputs = [ "out" "dev" "devdoc" ];
buildInputs =
[ pkgconfig intltool gtk libxfce4util exo libwnck
garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme
] ++ xfce4-mixer.gst_plugins
++ optional withGtk3 gtk3;
propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ];
configureFlags = optional withGtk3 "--enable-gtk3";
postInstall = ''
wrapProgram "$out/bin/xfce4-panel" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://www.xfce.org/projects/xfce4-panel;
description = "Xfce panel";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

View file

@ -10,7 +10,7 @@ mkXfceDerivation {
nativeBuildInputs = [ gobject-introspection ];
buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ];
patches = [ ../../xfce/core/xfce4-panel-datadir.patch ];
patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1";
postPatch = ''

View file

@ -1,44 +0,0 @@
{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf
, libxfce4ui, libxfce4util, libnotify, xfce4-panel, hicolor-icon-theme
, withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }:
let
p_name = "xfce4-power-manager";
ver_maj = if withGtk3 then "1.6" else "1.4";
ver_min = if withGtk3 then "0" else "4";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 =
if withGtk3
then "0avzhllpimcn7a6z9aa4jn0zg5ahxr9ks5ldchizycdb0rz1bqxx"
else "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
};
buildInputs =
[ pkgconfig intltool glib dbus-glib upower xfconf libxfce4util
libnotify hicolor-icon-theme
] ++
(if withGtk3
then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ]
else [ gtk libxfce4ui xfce4-panel ]);
postPatch = lib.optionalString withGtk3 ''
substituteInPlace configure --replace gio-2.0 gio-unix-2.0
'';
postConfigure = lib.optionalString withGtk3 ''
substituteInPlace src/Makefile --replace "xfce4_power_manager_CFLAGS = " "xfce4_power_manager_CFLAGS = \$(GIO_CFLAGS) "
substituteInPlace settings/Makefile --replace "xfce4_power_manager_settings_CFLAGS = " "xfce4_power_manager_settings_CFLAGS = \$(GIO_CFLAGS) "
'';
meta = with stdenv.lib; {
homepage = https://goodies.xfce.org/projects/applications/xfce4-power-manager;
description = "A power manager for the Xfce Desktop Environment";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

View file

@ -16,4 +16,8 @@ mkXfceDerivation {
automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS
automakeAddFlags settings/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
'';
meta = {
description = "A power manager for the Xfce Desktop Environment";
};
}

View file

@ -1,44 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, polkit
, libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg
, hicolor-icon-theme
}:
let
p_name = "xfce4-session";
ver_maj = "4.12";
ver_min = "1";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd";
};
patches = [
# Fix "lock screen" not working for light-locker
./xfce4-light-locker.patch
];
buildInputs =
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib
xfconf xfce4-panel libglade xorg.iceauth xorg.libSM
polkit hicolor-icon-theme
]; #TODO: upower-glib, gconf (assistive?), gnome keyring
preBuild = ''
sed '/^PATH=/d' -i scripts/xflock4
sed '/^export PATH$/d' -i scripts/xflock4
'';
configureFlags = [ "--with-xsession-prefix=$(out)" ];
meta = with stdenv.lib; {
homepage = https://www.xfce.org/projects/xfce4-session;
description = "Session manager for Xfce";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

View file

@ -1,4 +1,4 @@
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }:
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }:
mkXfceDerivation {
category = "xfce";
@ -14,6 +14,8 @@ mkXfceDerivation {
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
meta = {
description = "Session manager for Xfce";
};

View file

@ -1,11 +0,0 @@
--- a/xfsettingsd/xsettings.xml 2015-02-28 22:32:02.681796319 +0100
+++ b/xfsettingsd/xsettings.xml 2015-02-28 22:32:27.881214735 +0100
@@ -7,7 +7,7 @@
<channel name="xsettings" version="1.0">
<property name="Net" type="empty">
<property name="ThemeName" type="empty"/>
- <property name="IconThemeName" type="empty"/>
+ <property name="IconThemeName" type="string" value="Rodent"/>
<property name="DoubleClickTime" type="int" value="400"/>
<property name="DoubleClickDistance" type="int" value="5"/>
<property name="DndDragThreshold" type="int" value="8"/>

View file

@ -1,54 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, garcon, libxfce4util
, libxfce4ui, xfconf, libXi, upower ? null, libnotify ? null
, libXcursor ? null, xf86inputlibinput ? null, libxklavier ? null }:
let
p_name = "xfce4-settings";
ver_maj = "4.12";
ver_min = "1";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0x35i1cvkqp0hib1knwa58mckdwrfbhaisz4bsx6bbbx385llj7n";
};
patches = [ ./xfce4-settings-default-icon-theme.patch ];
postPatch = ''
for f in $(find . -name \*.c); do
substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>'
done
'';
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
exo
gtk
garcon
libxfce4util
libxfce4ui
xfconf
libXi
upower
libnotify
libXcursor
xf86inputlibinput
libxklavier
];
configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://www.xfce.org/projects/xfce4-settings;
description = "Settings manager for Xfce";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

View file

@ -33,4 +33,8 @@ mkXfceDerivation {
"--enable-pluggable-dialogs"
"--enable-sound-settings"
];
meta = {
description = "Settings manager for Xfce";
};
}

View file

@ -1,30 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus-glib }:
let
p_name = "xfconf";
ver_maj = "4.12";
ver_min = "1";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m";
};
outputs = [ "out" "dev" "devdoc" ];
#TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib libxfce4util ];
propagatedBuildInputs = [ dbus-glib ];
doCheck = false; # requires dbus daemon
meta = with stdenv.lib; {
homepage = http://docs.xfce.org/xfce/xfconf/start;
description = "Simple client-server configuration storage and query system for Xfce";
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -8,4 +8,8 @@ mkXfceDerivation {
sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs";
buildInputs = [ libxfce4util ];
meta = {
description = "Simple client-server configuration storage and query system for Xfce";
};
}

View file

@ -1,36 +0,0 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libwnck, xfconf, libglade, xfce4-panel, thunar, exo, garcon, libnotify
, hicolor-icon-theme }:
let
p_name = "xfdesktop";
ver_maj = "4.12";
ver_min = "3";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac";
};
buildInputs = [
pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
libglade xfce4-panel thunar exo garcon libnotify hicolor-icon-theme
];
patches = [(fetchpatch {
url = https://git.xfce.org/xfce/xfdesktop/patch?id=157f5b55cfc3629d595ef38984278de5915aac27;
sha256 = "0ki7hnyfpz7bdmsxqnm9qvyk040iyv1fawnhzfbyyzrh4nc5jd3x";
})];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://www.xfce.org/projects/xfdesktop;
description = "Xfce desktop manager";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

View file

@ -1,31 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
let
p_name = "xfwm4";
ver_maj = "4.12";
ver_min = "4";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0dpvdrd5lclkcrzmdpva38gfsgvdf3xkqfknvy96x6k4fn508x7s";
};
buildInputs =
[ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf
libwnck libstartup_notification
xorg.libXcomposite xorg.libXfixes xorg.libXdamage
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://www.xfce.org/projects/xfwm4;
description = "Window manager for Xfce";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

View file

@ -23,4 +23,8 @@ mkXfceDerivation {
libXpresent
xfconf
];
meta = {
description = "Window manager for Xfce";
};
}

View file

@ -3,91 +3,91 @@
lib.makeScope pkgs.newScope (self: with self; {
#### NixOS support
inherit (pkgs.gnome2) libglade vte gtksourceview;
inherit (pkgs.gnome3) dconf;
inherit (pkgs.perlPackages) URI;
gtk = pkgs.gtk2;
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
# Samba is a rather heavy dependency
gvfs = pkgs.gvfs.override { samba = null; };
xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
#### CORE
exo = callPackage ./core/exo.nix { };
exo = callPackage ./core/exo { };
garcon = callPackage ./core/garcon.nix { };
garcon = callPackage ./core/garcon { };
# When built with GTK 3, it was breaking GTK 3 app layout
gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; };
libxfce4ui = callPackage ./core/libxfce4ui { };
libxfce4ui = callPackage ./core/libxfce4ui.nix { };
libxfce4util = callPackage ./core/libxfce4util { };
libxfce4util = callPackage ./core/libxfce4util.nix { };
thunar = callPackage ./core/thunar {
thunarPlugins = [];
};
libxfcegui4 = callPackage ./core/libxfcegui4.nix { };
thunar-bare = callPackage ./core/thunar-build.nix { };
thunar = callPackage ./core/thunar.nix { };
# NB: thunar already has it
thunar-volman = callPackage ./core/thunar-volman.nix { };
thunar-volman = callPackage ./core/thunar-volman { };
thunar-archive-plugin = callPackage ./thunar-plugins/archive { };
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
tumbler = callPackage ./core/tumbler.nix { };
tumbler = callPackage ./core/tumbler { };
# TODO: impure plugins from /run/current-system/sw/lib/xfce4
xfce4-panel = callPackage ./core/xfce4-panel.nix { };
xfce4-panel = callPackage ./core/xfce4-panel { };
xfce4-session = callPackage ./core/xfce4-session.nix { };
xfce4-session = callPackage ./core/xfce4-session { };
xfce4-settings = callPackage ./core/xfce4-settings.nix { };
xfce4-settings = callPackage ./core/xfce4-settings { };
xfce4-power-manager = callPackage ./core/xfce4-power-manager.nix { };
xfce4-power-manager = callPackage ./core/xfce4-power-manager { };
xfconf = callPackage ./core/xfconf.nix { };
xfconf = callPackage ./core/xfconf { };
xfdesktop = callPackage ./core/xfdesktop.nix { };
xfdesktop = callPackage ./core/xfdesktop { };
xfwm4 = callPackage ./core/xfwm4.nix { };
xfwm4 = callPackage ./core/xfwm4 { };
xfce4-appfinder = callPackage ./core/xfce4-appfinder.nix { };
xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools.nix { };
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
mkXfceDerivation = mkXfceDerivation.override {
xfce4-dev-tools = null;
};
};
#### APPLICATIONS
gigolo = callPackage ./applications/gigolo.nix { };
gigolo = callPackage ./applications/gigolo { };
mousepad = callPackage ./applications/mousepad.nix { };
mousepad = callPackage ./applications/mousepad { };
orage = callPackage ./applications/orage.nix { };
orage = callPackage ./applications/orage { };
parole = callPackage ./applications/parole.nix { };
parole = callPackage ./applications/parole { };
ristretto = callPackage ./applications/ristretto.nix { };
ristretto = callPackage ./applications/ristretto { };
xfce4-mixer = callPackage ./applications/xfce4-mixer.nix { };
xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { };
xfce4-mixer-pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; };
xfce4-dict = callPackage ./applications/xfce4-dict { };
xfce4-notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4-terminal = callPackage ./applications/xfce4-terminal { };
xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager.nix { };
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {
inherit (pkgs.gnome3) libsoup;
};
xfce4-terminal = callPackage ./applications/terminal.nix { };
xfdashbooard = callPackage ./applications/xfdashboard {};
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { };
# TODO: this repo is inactive for many years. Remove?
xfce4-volumed = callPackage ./applications/xfce4-volumed { };
xfce4-volumed = callPackage ./applications/xfce4-volumed.nix { };
xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { };
xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse.nix { };
xfce4-notifyd = callPackage ./applications/xfce4-notifyd { };
xfburn = callPackage ./applications/xfburn { };
#### ART
@ -99,11 +99,11 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { };
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { };
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { };
@ -125,7 +125,7 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { };
xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
@ -141,23 +141,15 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { };
xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { };
xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { };
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { };
xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { };
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { };
#### GTK3 (deprecated, see NixOS/nixpkgs#32763)
libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
xfce4panel_gtk3 = xfce4-panel.override { withGtk3 = true; };
xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; };
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
} // lib.optionalAttrs (config.allowAliases or true) {
#### ALIASES - added 2018-01
@ -208,4 +200,21 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin;
xfce4_windowck_plugin = xfce4-windowck-plugin;
xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin;
xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
# added 2019-11-04
libxfce4ui_gtk3 = libxfce4ui;
xfce4panel_gtk3 = xfce4-panel;
xfce4_power_manager_gtk3 = xfce4-power-manager;
gtk = pkgs.gtk2;
libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library";
xinitrc = xfce4-session.xinitrc;
inherit (pkgs.gnome2) libglade;
inherit (pkgs.gnome3) vte gtksourceview;
xfce4-mixer-pulse = xfce4-mixer;
thunar-bare = thunar.override {
thunarPlugins = [];
};
})

View file

@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
p_name = "xfce4-battery-plugin";
ver_maj = "1.0";
ver_min = "5";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "04gbplcj8z4vg5xbks8cc2jjf62mmf9sdymg90scjwmb82pv2ngn";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Battery plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
};
}

View file

@ -8,4 +8,8 @@ mkXfceDerivation rec {
sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
meta = {
description = "Battery plugin for Xfce panel";
};
}

View file

@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
p_name = "xfce4-clipman-plugin";
ver_maj = "1.2";
ver_min = "6";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "19a8gwcqc0r5qqi8w28dc8arqip34m8yxdb87lgps9g5qfcky113";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Clipboard manager for Xfce panel";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
};
}

View file

@ -8,4 +8,8 @@ mkXfceDerivation rec {
sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq";
buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ];
meta = {
description = "Clipboard manager for Xfce panel";
};
}

View file

@ -1,29 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
p_name = "xfce4-cpufreq-plugin";
ver_maj = "1.1";
ver_min = "3";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0crd21l5cw0xgm6w7s049xa36k203yx7l56ssnah9nq1w73n58bl";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
enableParallelBuilding = true;
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "CPU Freq load plugin for Xfce panel";
license = [ licenses.gpl2Plus ];
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
};
}

View file

@ -7,4 +7,8 @@ mkXfceDerivation {
sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
meta = {
description = "CPU Freq load plugin for Xfce panel";
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }:
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ];
buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk2 hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4-panel
, gtk }:
, gtk2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfcegui4 xfce4-panel gtk ];
buildInputs = [ intltool libxfce4util libxfcegui4 xfce4-panel gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Eyes following you!";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
broken = true;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Filesystem monitor";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
broken = true;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Cyclically spawns a command and captures its output";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
broken = true;
};
}

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }:
xfconf, gtk2, exo, gnutls, libgcrypt }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
libxfcegui4 xfconf gtk exo gnutls libgcrypt ];
xfconf gtk2 exo gnutls libgcrypt ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Mailwatch plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ ];
broken = true;
};
}

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
libxfcegui4, xfconf, gtk, exo }:
xfconf, gtk2, exo }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
libxfcegui4 xfconf gtk exo ];
xfconf gtk2 exo ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "MPD plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ ];
broken = true;
};
}

View file

@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
p_name = "xfce4-netload-plugin";
ver_maj = "1.2";
ver_min = "4";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1lrhhzxmybcfl52hnadr2dvasis9wmk6a48pcy02s09ch8cfkb7z";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Battery plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
};
}

View file

@ -8,4 +8,8 @@ mkXfceDerivation rec {
sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
meta = {
description = "Battery plugin for Xfce panel";
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk libunique ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 libunique ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

View file

@ -1,34 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel_gtk3, xfconf
, gtk3, libpulseaudio, hicolor-icon-theme
, withKeybinder ? true, keybinder3
, withLibnotify ? true, libnotify
}:
assert withKeybinder -> keybinder3 != null;
assert withLibnotify -> libnotify != null;
with stdenv.lib;
stdenv.mkDerivation rec {
p_name = "xfce4-pulseaudio-plugin";
ver_maj = "0.2";
ver_min = "3";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "e82836bc8cf7d905b4e60d43dc630ba8e32dea785989700c71d4aeee9f583b33";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio hicolor-icon-theme ]
++ optional withKeybinder keybinder3
++ optional withLibnotify libnotify;
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Adjust the audio volume of the PulseAudio sound system";
platforms = platforms.linux;
maintainers = [ ];
};
}

View file

@ -16,4 +16,8 @@ mkXfceDerivation {
'';
buildInputs = [ gtk3 libnotify libpulseaudio libxfce4ui libxfce4util xfce4-panel xfconf ];
meta = {
description = "Adjust the audio volume of the PulseAudio sound system";
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui,
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxfce4ui,
libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gnome2.gtk
gtk2
libxfce4ui
libxfce4util
xfce4-panel

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel
, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf
gtk hicolor-icon-theme ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf
gtk2 hicolor-icon-theme ];
nativeBuildInputs = [ pkgconfig ];
@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = [ ];
broken = true;
};
}

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre
, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk }:
, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk ];
buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
hardeningDisable = [ "format" ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower,
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxml2, libsoup, upower,
libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util
buildInputs = [ gtk2 libxml2 libsoup upower libxfce4ui libxfce4util
xfce4-panel hicolor-icon-theme ];
enableParallelBuilding = true;

View file

@ -1,36 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, intltool, libxfce4util, libxfcegui4
, xfce4-panel, gtk, exo, garcon }:
with stdenv.lib;
stdenv.mkDerivation rec {
p_name = "xfce4-whiskermenu-plugin";
version = "1.7.2";
name = "${p_name}-${version}";
src = fetchFromGitHub {
owner = "gottcode";
repo = "xfce4-whiskermenu-plugin";
rev = "v${version}";
sha256 = "1rpazgnjp443abc31bgi6gp9q3sgbg13v7v74nn7vf6kl4v725ah";
};
nativeBuildInputs = [ cmake pkgconfig intltool ];
buildInputs = [ libxfce4util libxfcegui4 xfce4-panel gtk exo garcon ];
enableParallelBuilding = true;
preFixup = ''
substituteInPlace $out/bin/xfce4-popup-whiskermenu \
--replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel
'';
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Alternate application launcher for Xfce";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.pjbarnoy ];
};
}

View file

@ -15,4 +15,8 @@ mkXfceDerivation rec {
substituteInPlace $out/bin/xfce4-popup-whiskermenu \
--replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel
'';
meta = {
description = "Alternate application launcher for Xfce";
};
}

View file

@ -1,28 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4-panel
, garcon, gtk, libxklavier, librsvg, libwnck
}:
with stdenv.lib;
stdenv.mkDerivation rec {
p_name = "xfce4-xkb-plugin";
ver_maj = "0.7";
ver_min = "1";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel garcon
gtk libxklavier librsvg libwnck ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Allows you to setup and use multiple keyboard layouts";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
};
}

Some files were not shown because too many files have changed in this diff Show more