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

Merge remote-tracking branch 'origin/master' into systemd-219

Browse Source
This commit is contained in:
Eelco Dolstra
2015-10-01 14:17:46 +02:00
parent 96e1b7eaf9 562851a068
commit b23038dd80
874 changed files with 44453 additions and 5448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/xfce/core/thunar-archive-plugin.nix
-25
View File
@@ -1,25 +0,0 @@
{ stdenv, fetchurl, pkgconfig, thunar, intltool, exo, gtk, udev, libxfce4ui, libxfce4util, xfconf }:
stdenv.mkDerivation rec {
name = "thunar-archive-plugin-${version}";
maj_ver = "0.3";
version = "${maj_ver}.1";
src = fetchurl {
url = "mirror://xfce/src/thunar-plugins/${name}/${maj_ver}/${name}.tar.bz2";
sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z";
};
buildInputs = [ pkgconfig thunar intltool exo gtk udev libxfce4ui libxfce4util xfconf ];
enableParallelBuilding = true;
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/;
description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
}
pkgs/desktops/xfce/core/thunar.nix
+2
View File
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
};
name = "${p_name}-${ver_maj}.${ver_min}";
patches = [ ./thunarx_plugins_directory.patch ];
buildInputs = [
pkgconfig intltool
gtk dbus_glib libstartup_notification libnotify libexif pcre udev
pkgs/desktops/xfce/core/thunarx_plugins_directory.patch
+48
View File
@@ -0,0 +1,48 @@
diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c
index 31b8835..a3e7f4e 100644
--- a/thunarx/thunarx-provider-factory.c
+++ b/thunarx/thunarx-provider-factory.c
@@ -141,12 +141,19 @@ static GList*
thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory)
{
ThunarxProviderModule *module;
+ const gchar *thunar_dir;
const gchar *name;
GList *modules = NULL;
GList *lp;
GDir *dp;
- dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL);
+ thunar_dir = g_getenv("THUNARX_MODULE_DIR");
+ if (NULL == thunar_dir)
+ {
+ thunar_dir = THUNARX_DIRECTORY;
+ }
+
+ dp = g_dir_open (thunar_dir, 0, NULL);
if (G_LIKELY (dp != NULL))
{
/* 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
--- a/thunarx/thunarx-provider-module.c
+++ b/thunarx/thunarx-provider-module.c
@@ -174,10 +174,17 @@ static gboolean
thunarx_provider_module_load (GTypeModule *type_module)
{
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);
module->library = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
g_free (path);
pkgs/desktops/xfce/core/xfdesktop.nix
+2 -2
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
p_name = "xfdesktop";
ver_maj = "4.12";
ver_min = "2";
ver_min = "3";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225";
sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac";
};
name = "${p_name}-${ver_maj}.${ver_min}";
pkgs/desktops/xfce/default.nix
+4 -1
View File
@@ -26,7 +26,10 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
libxfcegui4 = callPackage ./core/libxfcegui4.nix { };
thunar = callPackage ./core/thunar.nix { };
thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now
thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { };
thunar-archive-plugin
= callPackage ./thunar-plugins/archive { };
thunar-dropbox-plugin
= callPackage ./thunar-plugins/dropbox { };
tumbler = callPackage ./core/tumbler.nix { };
xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
xfce4session = callPackage ./core/xfce4-session.nix { };
pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+58
View File
@@ -0,0 +1,58 @@
{ stdenv, fetchFromGitHub, pkgconfig, xfce4_dev_tools
, gtk
, thunar
, exo, libxfce4util, libxfce4ui
, xfconf, udev, libnotify
}:
stdenv.mkDerivation rec {
p_name = "thunar-archive-plugin";
ver_maj = "0.3";
ver_min = "1";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchFromGitHub {
owner = "xfce-mirror";
repo = p_name;
rev = "72b23eefc348bee31e06a04f968e430bc7dfa51e";
sha256 = "0l8715x23qmk0jkywiza3qx0xxmafxi4grp7p82kkc5df5ccs8kx";
};
buildInputs = [
pkgconfig
xfce4_dev_tools
thunar
exo gtk libxfce4util libxfce4ui
xfconf udev libnotify
];
preConfigure = ''
./autogen.sh
'';
/*
File roller `*.desktop` situation
---------------------------------
For some odd reason, in nix os, gnome file-roller's desktop file has the non-standard name
`org.gnome.FileRoller.desktop`. In order to be compatible with this odd context, create
a `*.tap` file of the same name.
IMPORTANT: Adapt or remove the symbolic link if the situation changes.
*/
preFixup = ''
pushd $out/libexec/thunar-archive-plugin > /dev/null
ln -s ./file-roller.tap org.gnome.FileRoller.tap
popd > /dev/null
rm $out/share/icons/hicolor/icon-theme.cache
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/;
description = "Thunar plugin providing file context menus for archives";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+41
View File
@@ -0,0 +1,41 @@
{ stdenv, fetchurl, pkgconfig
, gtk
, thunar, python2
}:
stdenv.mkDerivation rec {
p_name = "thunar-dropbox-plugin";
ver_maj = "0.2";
ver_min = "1";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "http://softwarebakery.com/maato/files/thunar-dropbox/thunar-dropbox-${ver_maj}.${ver_min}.tar.bz2";
sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf";
};
buildInputs = [
pkgconfig
gtk
thunar python2
];
configurePhase = "python2 waf configure --prefix=$out";
buildPhase = "python2 waf";
installPhase = ''
python2 waf install
'';
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://softwarebakery.com/maato/thunar-dropbox.html;
description = "A plugin for thunar that adds context-menu items from dropbox";
license = licenses.gpl3;
platforms = platforms.linux;
};
}