From cc85843116482f7924d0118447e72c1b3f165ed3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 25 Jun 2007 21:46:18 +0000
Subject: [PATCH] Added xmove - proxy X server which can move its clients to
 another one. Useful with Xvfb - so you can save your X session during needed
 reload of X.

svn path=/nixpkgs/trunk/; revision=8917
---
 pkgs/applications/misc/xmove/default.nix | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix          | 13 +++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/misc/xmove/default.nix

diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix
new file mode 100644
index 000000000000..da6d50928243
--- /dev/null
+++ b/pkgs/applications/misc/xmove/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, libX11, libXi, imake, xauth, libXau}:
+stdenv.mkDerivation {
+  name = "xmove";
+
+  src = fetchurl {
+    url = http://ftp.debian.org/debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz;
+    sha256 = "0q310k3bi39vdk0kqqvsahnb1k6lx9hlx80iyxnkq59l6jxnhyhf";
+  };
+
+  buildPhase = "cd xmove; cp ../man/man1/xmove.1 xmove.man ; xmkmf; make; cd .. ; cd xmovectrl ; cp ../man/man1/xmovectrl.1 xmovectrl.man; xmkmf; make ; cd ..";
+  installPhase = "cd xmove; make install install.man MANDIR=\${out}/man/man1 BINDIR=\${out}/bin; cd .. ; cd xmovectrl ; make install install.man MANDIR=\${out}/man/man1 BINDIR=\${out}/bin; cd ..";
+
+  buildInputs = [libX11 libXi imake xauth libXau];
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 529b194e6cbf..3476cb8838ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3158,6 +3158,11 @@ rec {
     inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
   };
 
+  xmove = import ../applications/misc/xmove {
+    inherit fetchurl stdenv;
+    inherit (xlibs) libX11 libXi imake libXau;
+    inherit (xorg) xauth;
+  };
   xvidcap = import ../applications/video/xvidcap {
     inherit fetchurl stdenv perl perlXMLParser pkgconfig;
     inherit (gtkLibs) gtk;
@@ -3383,4 +3388,12 @@ rec {
     };
   };
 
+  /*wine = import ../misc/emulators/wine {
+    inherit fetchurl stdenv flex bison mesa ncurses
+	libjpeg alsaLib lcms;
+    inherit (xlibs) libX11 libICE libXi libXcursor
+	libXinerama libXrandr libXrender libXxf86vm;
+    inherit (gtkLibs) gtk;
+  };*/
+
 }