From 238e80f7080e86485419456279da64873634d66e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Aug 2010 18:02:22 +0000 Subject: [PATCH] * More Xfce packages. svn path=/nixpkgs/trunk/; revision=23061 --- pkgs/desktops/xfce-4/core/exo.nix | 13 ++++------ pkgs/desktops/xfce-4/core/libxfce4menu.nix | 18 ++++++++++++++ pkgs/desktops/xfce-4/core/libxfcegui4.nix | 8 +++++-- pkgs/desktops/xfce-4/core/thunar.nix | 25 ++++++++++++++++++++ pkgs/desktops/xfce-4/core/xfce4-panel.nix | 4 +++- pkgs/desktops/xfce-4/core/xfce4-settings.nix | 24 +++++++++++++++++++ pkgs/desktops/xfce-4/core/xfdesktop.nix | 5 ++-- pkgs/desktops/xfce-4/core/xfwm4.nix | 8 +++++-- pkgs/desktops/xfce-4/default.nix | 14 +++++++++++ 9 files changed, 104 insertions(+), 15 deletions(-) create mode 100644 pkgs/desktops/xfce-4/core/libxfce4menu.nix create mode 100644 pkgs/desktops/xfce-4/core/thunar.nix create mode 100644 pkgs/desktops/xfce-4/core/xfce4-settings.nix diff --git a/pkgs/desktops/xfce-4/core/exo.nix b/pkgs/desktops/xfce-4/core/exo.nix index ead11e8e127..53fc8fa8fcd 100644 --- a/pkgs/desktops/xfce-4/core/exo.nix +++ b/pkgs/desktops/xfce-4/core/exo.nix @@ -1,10 +1,5 @@ -{ stdenv, fetchurl -, pkgconfig -, intltool -, URI -, glib, gtk -, libxfce4util -}: +{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4util +, enableHAL ? true, hal, dbus_glib }: stdenv.mkDerivation rec { name = "exo-0.3.107"; @@ -14,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "18z2xmdl577r60ln2waai10dd7i384k0bxrmf7gchrxd9c9aq4ha"; }; - buildInputs = [ pkgconfig intltool URI glib gtk libxfce4util ]; + buildInputs = + [ pkgconfig intltool URI glib gtk libxfce4util ] ++ + stdenv.lib.optionals enableHAL [ hal dbus_glib ]; meta = { homepage = http://www.xfce.org/projects/exo; diff --git a/pkgs/desktops/xfce-4/core/libxfce4menu.nix b/pkgs/desktops/xfce-4/core/libxfce4menu.nix new file mode 100644 index 00000000000..f8a0c1ba87c --- /dev/null +++ b/pkgs/desktops/xfce-4/core/libxfce4menu.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, glib, intltool, gtk, libxfce4util }: + +stdenv.mkDerivation rec { + name = "libxfce4menu-4.6.2"; + + src = fetchurl { + url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2"; + sha1 = "32a85c1ad31360347d5a2f240c4ddc08b444d124"; + }; + + buildInputs = [ pkgconfig glib intltool gtk libxfce4util ]; + + meta = { + homepage = http://www.xfce.org/; + description = "Xfce menu support library"; + license = "LGPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce-4/core/libxfcegui4.nix b/pkgs/desktops/xfce-4/core/libxfcegui4.nix index 01913a3df59..52ee3a6262f 100644 --- a/pkgs/desktops/xfce-4/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce-4/core/libxfcegui4.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf, libglade }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf +, libglade, libstartup_notification }: stdenv.mkDerivation rec { name = "libxfcegui4-4.6.4"; @@ -15,7 +16,10 @@ stdenv.mkDerivation rec { configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0" ''; - buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade ]; + buildInputs = + [ pkgconfig intltool gtk libxfce4util xfconf libglade + libstartup_notification + ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce-4/core/thunar.nix b/pkgs/desktops/xfce-4/core/thunar.nix new file mode 100644 index 00000000000..adbbd461c5e --- /dev/null +++ b/pkgs/desktops/xfce-4/core/thunar.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util +, dbus_glib, libstartup_notification, xfconf, hal, xfce4panel +, gamin }: + +stdenv.mkDerivation rec { + name = "thunar-1.0.2"; + + src = fetchurl { + url = http://www.xfce.org/archive/xfce/4.6.2/src/Thunar-1.0.2.tar.bz2; + sha1 = "f7ae00c32402e4bc502aba15477b78e2c558c7c3"; + }; + + buildInputs = + [ pkgconfig intltool exo gtk libxfce4util + dbus_glib libstartup_notification xfconf xfce4panel gamin + ]; + + propagatedBuildInputs = [ hal ]; + + meta = { + homepage = http://thunar.xfce.org/; + description = "Xfce file manager"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce-4/core/xfce4-panel.nix b/pkgs/desktops/xfce-4/core/xfce4-panel.nix index db2e046dd6a..b8a8c145801 100644 --- a/pkgs/desktops/xfce-4/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce-4/core/xfce4-panel.nix @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfcegui4 exo libwnck + [ pkgconfig intltool gtk libxfce4util exo libwnck libstartup_notification ]; + propagatedBuildInputs = [ libxfcegui4 ]; + meta = { homepage = http://www.xfce.org/; description = "Xfce panel"; diff --git a/pkgs/desktops/xfce-4/core/xfce4-settings.nix b/pkgs/desktops/xfce-4/core/xfce4-settings.nix new file mode 100644 index 00000000000..b0bfadf8e52 --- /dev/null +++ b/pkgs/desktops/xfce-4/core/xfce4-settings.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfcegui4 +, libglade, xfconf, xorg, libwnck, libnotify }: + +stdenv.mkDerivation rec { + name = "xfce4-settings-4.6.5"; + + src = fetchurl { + url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + sha1 = "c036cc2f3100a46b2649e678dff7c0106b219263"; + }; + + buildInputs = + [ pkgconfig intltool exo gtk libxfce4util libxfcegui4 libglade + xfconf xorg.libXi xorg.libXcursor libwnck libnotify + #gtk libxfce4util libxfcegui4 libwnck dbus_glib + #xfconf libglade xorg.iceauth + ]; + + meta = { + homepage = http://www.xfce.org/; + description = "Settings manager for Xfce"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce-4/core/xfdesktop.nix b/pkgs/desktops/xfce-4/core/xfdesktop.nix index c005e300e2f..83de4ed4dfe 100644 --- a/pkgs/desktops/xfce-4/core/xfdesktop.nix +++ b/pkgs/desktops/xfce-4/core/xfdesktop.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 -, libwnck, xfconf, libglade }: +, libwnck, xfconf, libglade, libxfce4menu, xfce4panel, thunar, exo }: stdenv.mkDerivation rec { name = "xfdesktop-4.6.2"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck xfconf - libglade ]; + libglade libxfce4menu xfce4panel thunar exo + ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce-4/core/xfwm4.nix b/pkgs/desktops/xfce-4/core/xfwm4.nix index 27a34043cad..c7bab240691 100644 --- a/pkgs/desktops/xfce-4/core/xfwm4.nix +++ b/pkgs/desktops/xfce-4/core/xfwm4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util -, libxfcegui4, xfconf, libwnck }: +, libxfcegui4, xfconf, libwnck, libstartup_notification, xorg }: stdenv.mkDerivation rec { name = "xfwm4-4.6.2"; @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0a2q2pr5mzp6hsrd0llr90i9wii2qj2054shkpvkain20gp1ja11"; }; - buildInputs = [ pkgconfig intltool gtk libglade libxfce4util libxfcegui4 xfconf libwnck ]; + buildInputs = + [ pkgconfig intltool gtk libglade libxfce4util libxfcegui4 xfconf + libwnck libstartup_notification + xorg.libXcomposite xorg.libXfixes xorg.libXdamage + ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix index 2aa25c19341..a6d2629c3b5 100644 --- a/pkgs/desktops/xfce-4/default.nix +++ b/pkgs/desktops/xfce-4/default.nix @@ -15,6 +15,8 @@ rec { inherit (pkgs.gnome) libglade; }; + libxfce4menu = callPackage ./core/libxfce4menu.nix { }; + xfconf = callPackage ./core/xfconf.nix { }; xfwm4 = callPackage ./core/xfwm4.nix { @@ -27,6 +29,10 @@ rec { inherit (pkgs.gnome) libglade libwnck; }; + xfce4settings = callPackage ./core/xfce4-settings.nix { + inherit (pkgs.gnome) libglade libwnck; + }; + xfce4panel = callPackage ./core/xfce4-panel.nix { inherit (pkgs.gnome) libwnck; }; @@ -35,10 +41,18 @@ rec { inherit (pkgs.gnome) libwnck libglade; }; + thunar = callPackage ./core/thunar.nix { + #inherit (pkgs.gnome) libwnck libglade; + }; + #### APPLICATIONS terminal = callPackage ./applications/terminal.nix { inherit (pkgs.gnome) vte; }; + #### ART + + xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; + }