Merge branch 'master' into x-updates

Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2013-03-09 17:55:37 +01:00
607 changed files with 8977 additions and 2289 deletions
+10 -4
View File
@@ -1,9 +1,15 @@
{ h, v, stdenv, fetchXfce, python, gettext, intltool, pkgconfig, gtk, gvfs }:
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs }:
stdenv.mkDerivation rec {
name = "gigolo-${v}";
p_name = "gigolo";
ver_maj = "0.4";
ver_min = "1";
src = fetchXfce.app name h;
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ python gettext intltool gtk pkgconfig gvfs];
@@ -12,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://goodies.xfce.org/projects/applications/gigolo;
homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
description = "A frontend to easily manage connections to remote filesystems";
platforms = stdenv.lib.platforms.linux;
};
+11 -4
View File
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, libxfce4util, libxfcegui4
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4
, gtk, gtksourceview, dbus, dbus_glib }:
stdenv.mkDerivation rec {
name = "mousepad-${v}";
src = fetchXfce.app name h;
p_name = "mousepad";
ver_maj = "0.3";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [
pkgconfig intltool libxfce4util libxfcegui4
@@ -11,7 +18,7 @@ stdenv.mkDerivation rec {
];
meta = {
homepage = http://www.xfce.org/projects/mousepad/;
homepage = http://www.xfce.org/;
description = "A simple text editor for Xfce";
license = "GPLv2+";
};
+11 -4
View File
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, libexif, gtk
{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk
, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }:
stdenv.mkDerivation rec {
name = "ristretto-${v}";
src = fetchXfce.app name h;
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
@@ -12,7 +19,7 @@ stdenv.mkDerivation rec {
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = http://goodies.xfce.org/projects/applications/ristretto;
homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
+10 -3
View File
@@ -1,10 +1,17 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, ncurses, gtk, vte, dbus_glib
{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus_glib
, exo, libxfce4util, libxfce4ui
}:
stdenv.mkDerivation rec {
name = "xfce4-terminal-${v}";
src = fetchXfce.app name h;
p_name = "xfce4-terminal";
ver_maj = "0.6";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1j6lpkq952mrl5p24y88f89wn9g0namvywhma639xxsswlkn8d31";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ];
@@ -1,4 +1,4 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, glib, gstreamer, gst_plugins_base, gtk
{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base, gtk
, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique?null }:
let
@@ -11,8 +11,15 @@ let
in
stdenv.mkDerivation rec {
name = "xfce4-mixer-${v}";
src = fetchXfce.app name h;
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 gst_plugins_minimal gtk
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool
{ stdenv, fetchurl, pkgconfig, intltool
, gtk , libxfce4util, libxfce4ui, xfconf }:
stdenv.mkDerivation rec {
name = "xfce4-notifyd-${v}";
src = fetchXfce.app name h;
p_name = "xfce4-notifyd";
ver_maj = "0.2";
ver_min = "2";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui xfconf ];
@@ -14,7 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd;
homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
description = "Notification daemon for Xfce";
license = "GPLv2+";
};
@@ -1,14 +1,21 @@
{ stdenv, v, h, fetchXfce, intltool, pkgconfig, gtk, libwnck }:
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libwnck }:
stdenv.mkDerivation rec {
name = "xfce4-taskmanager-${v}";
src = fetchXfce.app name h;
p_name = "xfce4-taskmanager";
ver_maj = "1.0";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ intltool pkgconfig gtk libwnck ];
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-taskmanager;
description = "Easy to use task manager for XFCE";
homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
description = "Easy to use task manager for Xfce";
platforms = stdenv.lib.platforms.linux;
};
}
+10 -3
View File
@@ -1,8 +1,15 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, gtk }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
stdenv.mkDerivation rec {
name = "xfce4-icon-theme-${v}";
src = fetchXfce.art name h;
p_name = "xfce4-icon-theme";
ver_maj = "4.4";
ver_min = "3";
src = fetchurl {
url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool gtk ];
+11 -4
View File
@@ -1,15 +1,22 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util }:
{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util }:
stdenv.mkDerivation rec {
name = "exo-${v}";
src = fetchXfce.core name h;
p_name = "exo";
ver_maj = "0.10";
ver_min = "2";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool URI glib gtk libxfce4ui libxfce4util ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = http://www.xfce.org/projects/exo;
homepage = "http://www.xfce.org/projects/${p_name}";
description = "Application library for the Xfce desktop environment";
license = "GPLv2+";
};
+10 -3
View File
@@ -1,8 +1,15 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, glib, libxfce4util }:
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }:
stdenv.mkDerivation rec {
name = "garcon-${v}";
src = fetchXfce.core name h;
p_name = "garcon";
ver_maj = "0.2";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool glib libxfce4util ];
+10 -3
View File
@@ -1,8 +1,15 @@
{ stdenv, fetchXfce, pkgconfig, intltool, gtk }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
stdenv.mkDerivation rec {
name = "gtk-xfce-engine-3.0.1";
src = fetchXfce.core name "0vd0ly81540f9133abza56mlqqx1swp0j70ll8kf948sva0wy0zb";
p_name = "gtk-xfce-engine";
ver_maj = "3.0";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0vd0ly81540f9133abza56mlqqx1swp0j70ll8kf948sva0wy0zb";
};
name = "${p_name}-${ver_maj}.${ver_min}";
#TODO: gtk3
buildInputs = [ pkgconfig intltool gtk ];
+11 -5
View File
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, gtk, libxfce4util, xfconf
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
, libglade, libstartup_notification }:
stdenv.mkDerivation rec {
name = "libxfce4ui-${v}";
src = fetchXfce.core name h;
p_name = "libxfce4ui";
ver_maj = "4.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2";
};
name = "${p_name}-${ver_maj}.${ver_min}";
#TODO: gladeui
# Install into our own prefix instead.
@@ -20,8 +27,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
homepage = http://www.xfce.org/projects/libxfce4;
#TODO
homepage = http://www.xfce.org/;
description = "Basic GUI library for Xfce";
license = "LGPLv2+";
};
+11 -4
View File
@@ -1,13 +1,20 @@
{ v, h, stdenv, fetchXfce, pkgconfig, glib, intltool }:
{ stdenv, fetchurl, pkgconfig, glib, intltool }:
stdenv.mkDerivation rec {
name = "libxfce4util-${v}";
src = fetchXfce.core name h;
p_name = "libxfce4util";
ver_maj = "4.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig glib intltool ];
meta = {
homepage = http://www.xfce.org/projects/libxfce4;
homepage = http://www.xfce.org/;
description = "Basic utility non-GUI functions for Xfce";
license = "bsd";
};
+10 -3
View File
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, gtk
{ stdenv, fetchurl, pkgconfig, intltool, gtk
, libxfce4util, xfconf, libglade, libstartup_notification }:
stdenv.mkDerivation rec {
name = "libxfcegui4-${v}";
src = fetchXfce.core name h;
p_name = "libxfcegui4";
ver_maj = "4.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
};
name = "${p_name}-${ver_maj}.${ver_min}";
#TODO: gladeui
# By default, libxfcegui4 tries to install into libglade's prefix.
+7 -4
View File
@@ -2,12 +2,15 @@
, xfconf, udev, libnotify }:
stdenv.mkDerivation rec {
name = "thunar-volman-0.6.0";
p_name = "thunar-volman";
ver_maj = "0.8";
ver_min = "0";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/thunar-volman/0.6/${name}.tar.bz2";
sha1 = "dcda936948623b342b290a78c294f71c038e832e";
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util
@@ -18,7 +21,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
homepage = http://thunar.xfce.org/;
homepage = http://goodies.xfce.org/projects/thunar-plugins/thunar-volman;
description = "Thunar extension for automatic management of removable drives and media";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
+19 -9
View File
@@ -1,15 +1,25 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, exo, gtk, libxfce4util
, dbus_glib, libstartup_notification, libnotify, xfconf, xfce4panel, gamin, libexif, pcre }:
{ stdenv, fetchurl, pkgconfig, intltool
, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev
, exo, libxfce4util, xfconf, xfce4panel
}:
stdenv.mkDerivation rec {
name = "Thunar-${v}";
src = fetchXfce.core name h;
p_name = "thunar";
ver_maj = "1.6";
ver_min = "2";
buildInputs =
[ pkgconfig intltool exo gtk libxfce4util
dbus_glib libstartup_notification libnotify xfconf xfce4panel gamin libexif pcre
];
# TODO: gudev, optionality
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";
sha256 = "11dx38rvkfbp91pxrprymxhimsm90gvizp277x9s5rwnwcm1ggbx";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [
pkgconfig intltool
gtk dbus_glib libstartup_notification libnotify libexif pcre udev
exo libxfce4util xfconf xfce4panel
];
# TODO: optionality?
enableParallelBuilding = true;
+10 -3
View File
@@ -1,8 +1,15 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, dbus_glib, gdk_pixbuf }:
{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf }:
stdenv.mkDerivation rec {
name = "tumbler-${v}";
src = fetchXfce.core name h;
p_name = "tumbler";
ver_maj = "0.1";
ver_min = "27";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0s9qj99b81asmlqa823nzykq8g6p9azcp2niak67y9bp52wv6q2c";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf ];
+10 -3
View File
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, glib, gtk, libxfce4util
{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util
, libxfce4ui, garcon, xfconf }:
stdenv.mkDerivation rec {
name = "xfce4-appfinder-${v}";
src = fetchXfce.core name h;
p_name = "xfce4-appfinder";
ver_maj = "4.9"; # no 4.10 (stable) release yet
ver_min = "4";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
+10 -3
View File
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libwnck, exo, garcon, xfconf, libstartup_notification }:
stdenv.mkDerivation rec {
name = "xfce4-panel-${v}";
src = fetchXfce.core name h;
p_name = "xfce4-panel";
ver_maj = "4.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1f8903nx6ivzircl8d8s9zna4vjgfy0qhjk5d2x19g9bmycgj89k";
};
name = "${p_name}-${ver_maj}.${ver_min}";
patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1";
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, gtk, dbus_glib, xfconf
{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf
, libxfce4ui, libxfce4util, libnotify, xfce4panel }:
stdenv.mkDerivation rec {
name = "xfce4-power-manager-${v}";
src = fetchXfce.core name h;
p_name = "xfce4-power-manager";
ver_maj = "1.0";
ver_min = "10";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1w120k1sl4s459ijaxkqkba6g1p2sqrf9paljv05wj0wz12bpr40";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util
+10 -3
View File
@@ -1,11 +1,18 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui, xfce4panel
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui, xfce4panel
, libwnck, dbus_glib, xfconf, libglade, xorg }:
#TODO: gnome stuff: gconf (assistive?), keyring
stdenv.mkDerivation rec {
name = "xfce4-session-${v}";
src = fetchXfce.core name h;
p_name = "xfce4-session";
ver_maj = "4.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1kj65jkjhd0ysf0yxsf88wzpyv6n8i8qgd3gb502hf1x9jksk2mv";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
+10 -3
View File
@@ -1,10 +1,17 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon }:
#TODO: optional packages
stdenv.mkDerivation rec {
name = "xfce4-settings-${v}";
src = fetchXfce.core name h;
p_name = "xfce4-settings";
ver_maj = "4.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0zppq747z9lrxyv5zrrvpalq7hb3gfhy9p7qbldisgv7m6dz0hq8";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade
+11 -4
View File
@@ -1,15 +1,22 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
stdenv.mkDerivation rec {
name = "xfconf-${v}";
src = fetchXfce.core name h;
p_name = "xfconf";
ver_maj = "4.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp";
};
name = "${p_name}-${ver_maj}.${ver_min}";
#TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
buildInputs = [ pkgconfig intltool glib libxfce4util ];
propagatedBuildInputs = [ dbus_glib ];
meta = {
homepage = http://www.xfce.org/projects/xfconf;
homepage = http://docs.xfce.org/xfce/xfconf/start;
description = "Simple client-server configuration storage and query system for Xfce";
license = "GPLv2";
};
+10 -3
View File
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify }:
stdenv.mkDerivation rec {
name = "xfdesktop-${v}";
src = fetchXfce.core name h;
p_name = "xfdesktop";
ver_maj = "4.10";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1bfl2xzmci7vqwwz2k2gp7ykysjnq9dcwpnzkwbpv5hv3qwgx0r8";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
+10 -3
View File
@@ -1,9 +1,16 @@
{ v, h, stdenv, fetchXfce, pkgconfig, gtk, intltool, libglade, libxfce4util
{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
stdenv.mkDerivation rec {
name = "xfwm4-${v}";
src = fetchXfce.core name h;
p_name = "xfwm4";
ver_maj = "4.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "170zzs7adj47srsi2cl723w9pl8k8awd7w1bpzxby7hj92zmf8s9";
};
name = "${p_name}-${ver_maj}.${ver_min}";
#TODO: kde systray, docs
buildInputs =
+76
View File
@@ -0,0 +1,76 @@
{ pkgs, newScope }: let
callPackage = newScope (deps // xfce_self);
deps = rec { # xfce-global dependency overrides should be here
inherit (pkgs.gnome) libglade libwnck vte gtksourceview;
inherit (pkgs.perlPackages) URI;
# The useful bits from gnome-disk-utility.
libgdu = callPackage ./support/libgdu.nix { };
# Gvfs is required by Thunar for the trash feature and for volume
# mounting. Should use the one from Gnome, but I don't want to mess
# with the Gnome packages (or pull in a zillion Gnome dependencies).
gvfs = callPackage ./support/gvfs.nix { };
};
xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach
#### NixOS support
inherit (deps) gvfs;
xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc";
#### CORE from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"
exo = callPackage ./core/exo.nix { };
garcon = callPackage ./core/garcon.nix { };
gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; # ToDo: when should be used?
libxfce4ui = callPackage ./core/libxfce4ui.nix { };
libxfce4util = callPackage ./core/libxfce4util.nix { };
libxfcegui4 = callPackage ./core/libxfcegui4.nix { };
thunar = callPackage ./core/thunar.nix { };
thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now
tumbler = callPackage ./core/tumbler.nix { }; # ToDo: segfaults after some work
xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
xfce4session = callPackage ./core/xfce4-session.nix { };
xfce4settings = callPackage ./core/xfce4-settings.nix { };
xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { };
xfceutils = null; # removed in 4.10
xfconf = callPackage ./core/xfconf.nix { };
xfdesktop = callPackage ./core/xfdesktop.nix { };
xfwm4 = callPackage ./core/xfwm4.nix { };
xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { };
#### APPLICATIONS from "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"
gigolo = callPackage ./applications/gigolo.nix { };
mousepad = callPackage ./applications/mousepad.nix { };
ristretto = callPackage ./applications/ristretto.nix { };
terminal = xfce4terminal; # it has changed its name
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
xfce4terminal = callPackage ./applications/terminal.nix { };
#### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
#### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"
xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
}; # xfce_self
in xfce_self
@@ -1,19 +1,22 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
stdenv.mkDerivation rec {
name = "xfce4-cpufreq-plugin-1.0.0";
p_name = "xfce4-cpufreq-plugin";
ver_maj = "1.0";
ver_min = "0";
src = fetchurl {
url = "http://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.0/${name}.tar.bz2";
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = http://www.xfce.org/;
description = "CPU Freq load panel plugin for Xfce";
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "CPU Freq load plugin for Xfce panel";
platforms = stdenv.lib.platforms.linux;
};
}
@@ -1,18 +1,21 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}:
stdenv.mkDerivation rec {
name = "xfce4-systemload-plugin-1.1.1";
p_name = "xfce4-systemload-plugin";
ver_maj = "1.1";
ver_min = "1";
src = fetchurl {
url = "http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.1/${name}.tar.bz2";
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1bnrr30h6kgb37ixcq7frx2gvj2p99bpa1jyzppwjxp5x7xkxh8s";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk ];
meta = {
homepage = http://www.xfce.org/;
description = "System load panel plugin for Xfce";
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "System load plugin for Xfce panel";
platforms = stdenv.lib.platforms.linux;
};
}