Author: eelco
Date: Mon Aug 9 19:41:12 2010
New Revision: 23067
URL: https://svn.nixos.org/websvn/nix/?rev=23067&sc=1
Log:
* More Xfce stuff.
Added:
nixpkgs/trunk/pkgs/desktops/xfce-4/applications/mousepad.nix
nixpkgs/trunk/pkgs/desktops/xfce-4/applications/ristretto.nix
nixpkgs/trunk/pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4/default.nix
Added: nixpkgs/trunk/pkgs/desktops/xfce-4/applications/mousepad.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/applications/mousepad.nix Mon Aug
9 19:41:12 2010 (r23067)
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, gtk }:
+
+stdenv.mkDerivation rec {
+ name = "mousepad-0.2.16";
+
+ src = fetchurl {
+ url = "http://www.xfce.org/archive/src/apps/mousepad/0.2/${name}.tar.bz2";;
+ sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9";
+ };
+
+ buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 gtk ];
+
+ meta = {
+ homepage = http://www.xfce.org/projects/mousepad/;
+ description = "A simple text editor for Xfce";
+ license = "GPLv2+";
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/xfce-4/applications/ristretto.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/applications/ristretto.nix Mon Aug
9 19:41:12 2010 (r23067)
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk, thunar
+, exo, dbus_glib, libxfce4util, libxfcegui4, xfconf }:
+
+stdenv.mkDerivation rec {
+ name = "ristretto-0.0.22";
+
+ src = fetchurl {
+ url = "http://www.xfce.org/archive/src/apps/ristretto/0.0/${name}.tar.gz";;
+ sha1 = "bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a";
+ };
+
+ buildInputs =
+ [ pkgconfig intltool libexif gtk thunar exo dbus_glib
+ libxfce4util libxfcegui4 xfconf
+ ];
+
+ NIX_LDFLAGS = "-lX11";
+
+ meta = {
+ homepage = http://goodies.xfce.org/projects/applications/ristretto;
+ description = "A fast and lightweight picture-viewer for the Xfce desktop
environment";
+ license = "GPLv2+";
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix Mon Aug 9
19:41:12 2010 (r23067)
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
+
+stdenv.mkDerivation rec {
+ name = "gtk-xfce-engine-2.6.0";
+
+ src = fetchurl {
+ url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
+ sha1 = "a7be2f330833d150c5fb37f68a4c2138348b5446";
+ };
+
+ buildInputs =
+ [ pkgconfig intltool gtk ];
+
+ meta = {
+ homepage = http://www.xfce.org/;
+ description = "GTK+ theme engine for Xfce";
+ license = "GPLv2+";
+ };
+}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4/default.nix Mon Aug 9 19:29:06
2010 (r23066)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4/default.nix Mon Aug 9 19:41:12
2010 (r23067)
@@ -41,9 +41,9 @@
inherit (pkgs.gnome) libwnck libglade;
};
- thunar = callPackage ./core/thunar.nix {
- #inherit (pkgs.gnome) libwnck libglade;
- };
+ thunar = callPackage ./core/thunar.nix { };
+
+ gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
#### APPLICATIONS
@@ -51,6 +51,10 @@
inherit (pkgs.gnome) vte;
};
+ mousepad = callPackage ./applications/mousepad.nix { };
+
+ ristretto = callPackage ./applications/ristretto.nix { };
+
#### ART
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
