summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-01-15 12:11:07 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-01-15 12:11:07 +0100
commiteeda226b02e4140e864e61fcb9ac91e25bdacacb (patch)
tree8ed5c206c98b3c21c0f09ed9ba3f03edcf7beea3 /pkgs/desktops
parentee19b41203a75aabaafa8093f3b6ef487a9febc8 (diff)
parent76d8b3a530c3116b21afd25c24fec16983bf94cf (diff)
downloadnixlib-eeda226b02e4140e864e61fcb9ac91e25bdacacb.tar
nixlib-eeda226b02e4140e864e61fcb9ac91e25bdacacb.tar.gz
nixlib-eeda226b02e4140e864e61fcb9ac91e25bdacacb.tar.bz2
nixlib-eeda226b02e4140e864e61fcb9ac91e25bdacacb.tar.lz
nixlib-eeda226b02e4140e864e61fcb9ac91e25bdacacb.tar.xz
nixlib-eeda226b02e4140e864e61fcb9ac91e25bdacacb.tar.zst
nixlib-eeda226b02e4140e864e61fcb9ac91e25bdacacb.zip
Merge branch 'master' into systemd
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/xfce-4.8/applications/terminal.nix4
-rw-r--r--pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix18
-rw-r--r--pkgs/desktops/xfce-4.8/default.nix2
3 files changed, 22 insertions, 2 deletions
diff --git a/pkgs/desktops/xfce-4.8/applications/terminal.nix b/pkgs/desktops/xfce-4.8/applications/terminal.nix
index 44aa72d9d8c8..f03a940679a6 100644
--- a/pkgs/desktops/xfce-4.8/applications/terminal.nix
+++ b/pkgs/desktops/xfce-4.8/applications/terminal.nix
@@ -7,9 +7,9 @@
 
 stdenv.mkDerivation {
   name = "xfce-terminal-0.4.8";
-  
+
   src = fetchurl {
-    url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.8.tar.bz2;
+    url = http://archive.xfce.org/src/apps/xfce4-terminal/0.4/Terminal-0.4.8.tar.bz2;
     sha1 = "2f12c3a0fffad18976d47e531d404ee308cb2f05";
   };
 
diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix
new file mode 100644
index 000000000000..598e6eb414d1
--- /dev/null
+++ b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk, xfce }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-notifyd-0.2.2";
+  
+  src = fetchurl {
+    url = "http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/${name}.tar.bz2";
+    sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn";
+  };
+
+  buildInputs = [ intltool pkgconfig gtk xfce.libxfce4util xfce.libxfce4ui xfce.xfconf ];
+
+  meta = {
+    homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd;
+    description = "The Xfce Notify Daemon";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix
index c20e42d20196..bfe7fddd7381 100644
--- a/pkgs/desktops/xfce-4.8/default.nix
+++ b/pkgs/desktops/xfce-4.8/default.nix
@@ -73,6 +73,8 @@ rec {
 
   ristretto = callPackage ./applications/ristretto.nix { };
 
+  xfce4_notifyd = callPackage ./applications/xfce4-notifyd.nix { };
+
   xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { };
 
   xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };