Author: eelco
Date: Mon Aug 9 11:42:55 2010
New Revision: 23054
URL: https://svn.nixos.org/websvn/nix/?rev=23054&sc=1
Log:
* Add some more Xfce packages.
Added:
nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfce-utils.nix
nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfce4-panel.nix
nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfce4-session.nix
nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfdesktop.nix
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4/core/libxfce4util.nix
nixpkgs/trunk/pkgs/desktops/xfce-4/core/libxfcegui4.nix
nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfwm4.nix
nixpkgs/trunk/pkgs/desktops/xfce-4/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4/core/libxfce4util.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4/core/libxfce4util.nix Mon Aug 9
11:42:32 2010 (r23053)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/core/libxfce4util.nix Mon Aug 9
11:42:55 2010 (r23054)
@@ -13,6 +13,6 @@
meta = {
homepage = http://www.xfce.org/;
description = "Basic utility non-GUI functions for Xfce";
- license = "GPLv2";
+ license = "bsd";
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4/core/libxfcegui4.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4/core/libxfcegui4.nix Mon Aug 9
11:42:32 2010 (r23053)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/core/libxfcegui4.nix Mon Aug 9
11:42:55 2010 (r23054)
@@ -10,13 +10,16 @@
# 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";
+ preConfigure =
+ ''
+ configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
+ '';
buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade ];
meta = {
homepage = http://www.xfce.org/;
description = "Basic GUI library for Xfce";
- license = "GPLv2";
+ license = "LGPLv2+";
};
}
Added: nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfce-utils.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfce-utils.nix Mon Aug 9
11:42:55 2010 (r23054)
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 }:
+
+stdenv.mkDerivation rec {
+ name = "xfce-utils-4.6.2";
+
+ src = fetchurl {
+ url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
+ sha1 = "6373886c3d70e576859741bde747a235567ffd8e";
+ };
+
+ configureFlags = "--with-xsession-prefix=$(out)/share/xsessions";
+
+ buildInputs = [ pkgconfig intltool gtk libxfce4util libxfcegui4 ];
+
+ meta = {
+ homepage = http://www.xfce.org/;
+ description = "Utilities and scripts for Xfce";
+ license = "GPLv2+";
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfce4-panel.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfce4-panel.nix Mon Aug 9
11:42:55 2010 (r23054)
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, exo, libstartup_notification }:
+
+stdenv.mkDerivation rec {
+ name = "xfce4-panel-4.6.4";
+
+ src = fetchurl {
+ url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
+ sha1 = "d2b310c036be84ed9886c06ae35b7a1a8eabfcb8";
+ };
+
+ buildInputs =
+ [ pkgconfig intltool gtk libxfce4util libxfcegui4 exo libwnck
+ libstartup_notification
+ ];
+
+ meta = {
+ homepage = http://www.xfce.org/;
+ description = "Xfce panel";
+ license = "GPLv2+";
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfce4-session.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfce4-session.nix Mon Aug 9
11:42:55 2010 (r23054)
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, dbus_glib, xfconf, libglade, xorg }:
+
+stdenv.mkDerivation rec {
+ name = "xfce4-session-4.6.2";
+
+ src = fetchurl {
+ url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
+ sha1 = "2a5778a1543f97845f118a186e2dbb8a8ea3ff4b";
+ };
+
+ buildInputs =
+ [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck dbus_glib
+ xfconf libglade xorg.iceauth
+ ];
+
+ meta = {
+ homepage = http://www.xfce.org/;
+ description = "Session manager for Xfce";
+ license = "GPLv2+";
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfdesktop.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfdesktop.nix Mon Aug 9
11:42:55 2010 (r23054)
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, xfconf, libglade }:
+
+stdenv.mkDerivation rec {
+ name = "xfdesktop-4.6.2";
+
+ src = fetchurl {
+ url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
+ sha1 = "cefcd1c1386d34386d4e900cbf88b7c24ef3bafb";
+ };
+
+ buildInputs =
+ [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck xfconf
+ libglade ];
+
+ meta = {
+ homepage = http://www.xfce.org/;
+ description = "Xfce desktop manager";
+ license = "GPLv2+";
+ };
+}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfwm4.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfwm4.nix Mon Aug 9 11:42:32
2010 (r23053)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/core/xfwm4.nix Mon Aug 9 11:42:55
2010 (r23054)
@@ -14,6 +14,6 @@
meta = {
homepage = http://www.xfce.org/;
description = "Window manager for Xfce";
- license = "GPLv2";
+ license = "GPLv2+";
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4/default.nix Mon Aug 9 11:42:32
2010 (r23053)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/default.nix Mon Aug 9 11:42:55
2010 (r23054)
@@ -7,29 +7,38 @@
exo = callPackage ./core/exo.nix {
inherit (pkgs.perlPackages) URI;
- inherit (pkgs.gtkLibs) glib gtk;
};
- libxfce4util = callPackage ./core/libxfce4util.nix {
- inherit (pkgs.gtkLibs) glib;
- };
+ libxfce4util = callPackage ./core/libxfce4util.nix { };
libxfcegui4 = callPackage ./core/libxfcegui4.nix {
inherit (pkgs.gnome) libglade;
};
- xfconf = callPackage ./core/xfconf.nix {
- };
+ xfconf = callPackage ./core/xfconf.nix { };
xfwm4 = callPackage ./core/xfwm4.nix {
inherit (pkgs.gnome) libglade libwnck;
};
+ xfceutils = callPackage ./core/xfce-utils.nix { };
+
+ xfce4session = callPackage ./core/xfce4-session.nix {
+ inherit (pkgs.gnome) libglade libwnck;
+ };
+
+ xfce4panel = callPackage ./core/xfce4-panel.nix {
+ inherit (pkgs.gnome) libwnck;
+ };
+
+ xfdesktop = callPackage ./core/xfdesktop.nix {
+ inherit (pkgs.gnome) libwnck libglade;
+ };
+
#### APPLICATIONS
terminal = callPackage ./applications/terminal.nix {
inherit (pkgs.gnome) vte;
- inherit (pkgs.gtkLibs) gtk;
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
