summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/fluxbox/default.nix9
-rw-r--r--pkgs/applications/window-managers/weston/default.nix6
-rw-r--r--pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix30
-rw-r--r--pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix18
4 files changed, 55 insertions, 8 deletions
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
index b46864b9c2e..36e081ccfcf 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -4,19 +4,20 @@
 , libXinerama
 , imlib2 }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "fluxbox-${version}";
-  version = "1.3.5";
+  version = "1.3.7";
 
   buildInputs = [ pkgconfig freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/fluxbox/${name}.tar.bz2";
-    sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983";
+    url = "mirror://sourceforge/fluxbox/${name}.tar.xz";
+    sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w";
   };
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Full-featured, light-resource X window manager";
     longDescription = ''
       Fluxbox is a X window manager based on Blackbox 0.61.1 window
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index c78f7d2d241..9b88400ef53 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -5,14 +5,12 @@
 # beware of null defaults, as the parameters *are* supplied by callPackage by default
 }:
 
-let version = "1.6.0"; in
-
 stdenv.mkDerivation rec {
-  name = "weston-${version}";
+  name = "weston-${wayland.version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0kb1mb54l7adihmr2y77xgsdb00dvifnq886q2mmy0mz7g8sagnw";
+    sha256 = "1kb6a494j56sh7iy43xwkjlr3bh0nnkq4bkimwj6qirzbya12i8w";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
new file mode 100644
index 00000000000..1d2683c40fd
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }:
+
+stdenv.mkDerivation {
+  name = "wmCalClock-1.25";
+  src = fetchurl {
+     url = http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz;
+     sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f";
+  };
+
+  buildInputs = [ pkgconfig libX11 libXpm libXext ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/Src";
+
+  buildPhase=''
+    make prefix=$out
+  '';
+
+  installPhase = ''
+    mkdir -pv $out/bin
+    mkdir -pv $out/man/man1
+    make DESTDIR=$out install
+  '';
+
+  meta = {
+    description = "Clock for Windowmaker";
+    homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.bstrik ];
+  };
+}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
new file mode 100644
index 00000000000..358f3d22f39
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }:
+
+stdenv.mkDerivation {
+  name = "wmsystemtray-1.4";
+  src = fetchurl {
+     url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz;
+     sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9";
+  };
+
+  buildInputs = [ pkgconfig libX11 libXpm libXext libXfixes libXmu ];
+
+  meta = {
+    description = "Systemtray for Windowmaker";
+    homepage = "http://wmsystemtray.sourceforge.net";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.bstrik ];
+  };
+}