mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
Merge pull request #150 from ecarreras/fix-xfce4-panel-plugins
Fix xfce4 panel plugins
This commit is contained in:
commit
dd1867ce73
18
pkgs/desktops/xfce-4.8/applications/gigolo.nix
Normal file
18
pkgs/desktops/xfce-4.8/applications/gigolo.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gigolo-0.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.xfce.org/src/apps/gigolo/0.4/${name}.tar.bz2";
|
||||
sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2";
|
||||
};
|
||||
|
||||
buildInputs = [ python gettext intltool gtk pkgconfig gvfs];
|
||||
|
||||
meta = {
|
||||
homepage = http://goodies.xfce.org/projects/applications/gigolo;
|
||||
description = "Gigolo is a frontend to easily manage connections to remote filesystems";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
18
pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix
Normal file
18
pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl, intltool, pkgconfig, gtk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xfce4-taskmanager-1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.xfce.org/src/apps/xfce4-taskmanager/1.0/${name}.tar.bz2";
|
||||
sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0";
|
||||
};
|
||||
|
||||
buildInputs = [ intltool pkgconfig gtk ];
|
||||
|
||||
meta = {
|
||||
homepage = http://goodies.xfce.org/projects/applications/xfce4-taskmanager;
|
||||
description = "Easy to use task manager for XFCE";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
24
pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch
Normal file
24
pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff --git a/panel/panel-module-factory.c b/panel/panel-module-factory.c
|
||||
index 529fe85..8c792b7 100644
|
||||
--- a/panel/panel-module-factory.c
|
||||
+++ b/panel/panel-module-factory.c
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <panel/panel-module.h>
|
||||
#include <panel/panel-module-factory.h>
|
||||
|
||||
+#define DATADIR "/run/current-system/sw/share/xfce4"
|
||||
#define PANEL_PLUGINS_DATA_DIR (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
|
||||
#define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins")
|
||||
|
||||
diff --git a/panel/panel-module.c b/panel/panel-module.c
|
||||
index ba39320..519440b 100644
|
||||
--- a/panel/panel-module.c
|
||||
+++ b/panel/panel-module.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <panel/panel-plugin-external-wrapper.h>
|
||||
#include <panel/panel-plugin-external-46.h>
|
||||
|
||||
+#define LIBDIR "/run/current-system/sw/lib/xfce4"
|
||||
#define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
|
||||
#define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins")
|
||||
|
@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
|
||||
sha1 = "332fc968332e6271e1bb65d6de8de2524b0440ec";
|
||||
};
|
||||
|
||||
patches = [ ./xfce4-panel-datadir.patch ];
|
||||
patchFlags = "-p1";
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig intltool gtk libxfce4util garcon libxfce4ui xfconf
|
||||
exo libwnck
|
||||
|
@ -67,6 +67,8 @@ rec {
|
||||
inherit (pkgs.gnome) vte;
|
||||
};
|
||||
|
||||
gigolo = callPackage ./applications/gigolo.nix { };
|
||||
|
||||
mousepad = callPackage ./applications/mousepad.nix { };
|
||||
|
||||
ristretto = callPackage ./applications/ristretto.nix { };
|
||||
@ -75,9 +77,16 @@ rec {
|
||||
|
||||
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
|
||||
|
||||
xfce4_taskmanager = callPackage ./applications/xfce4-taskmanager.nix { };
|
||||
|
||||
|
||||
#### ART
|
||||
|
||||
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
|
||||
|
||||
#### PANEL PLUGINS
|
||||
|
||||
xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix {};
|
||||
xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix {};
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xfce4-cpufreq-plugin-1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.0/${name}.tar.bz2";
|
||||
sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xfce.org/;
|
||||
description = "CPU Freq load panel plugin for Xfce";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xfce4-systemload-plugin-1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.1/${name}.tar.bz2";
|
||||
sha256 = "1bnrr30h6kgb37ixcq7frx2gvj2p99bpa1jyzppwjxp5x7xkxh8s";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xfce.org/;
|
||||
description = "System load panel plugin for Xfce";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue
Block a user