Updating from trunk. I resolved simple conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25061

1 files changed, 18 insertions, 0 deletions

diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
new file mode 100644
index 0000000000000..016325140e05b
--- /dev/null
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, glib, pango, libxml2, libXau }:
+
+stdenv.mkDerivation rec {
+  name = "openbox-3-4-11-2";
+
+  buildInputs = [ pkgconfig glib pango libxml2 libXau ];
+
+  src = fetchurl {
+    url = http://openbox.org/dist/openbox/openbox-3.4.11.2.tar.gz;
+    sha256 = "2e7579389c30e6bb08cc721a2c1af512e049fec2670e71715aa1c4e129ec349d";
+  };
+
+  meta = {
+    description = "X window manager for non-desktop embedded systems";
+    homepage = http://openbox.org/;
+    license = "GPLv2+";
+  };
+}