From 36f0a97fc60d84c0cd59532b8687a445b1433ca2 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Mon, 6 Aug 2012 01:49:37 +0400
Subject: [PATCH 1/3] atool: add archiver helper

---
 pkgs/tools/archivers/atool/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/tools/archivers/atool/default.nix

diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix
new file mode 100644
index 000000000000..d376f75a552c
--- /dev/null
+++ b/pkgs/tools/archivers/atool/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, perl}:
+
+stdenv.mkDerivation rec {
+  name = "atool-0.39";
+  src = fetchurl {
+    url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz;
+    sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b";
+  };
+
+  buildInputs = [ perl ];
+
+  meta = {
+    homepage = http://www.nongnu.org/atool;
+    description = "Archive command line helper";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 743acccefb0b..a5c331aa5a89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -492,6 +492,8 @@ let
     inherit (haskellPackages) pandoc;
   };
 
+  atool = callPackage ../tools/archivers/atool { };
+
   bzip2 = callPackage ../tools/compression/bzip2 { };
 
   cabextract = callPackage ../tools/archivers/cabextract { };

From b229c3e09f7a967f161e15b290cd3874977bb0b8 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Tue, 14 Aug 2012 14:50:25 +0400
Subject: [PATCH 2/3] gxneur: add frontend for XNEUR keyboard layout switcher

---
 pkgs/applications/misc/gxneur/default.nix | 24 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  8 +++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/gxneur/default.nix

diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix
new file mode 100644
index 000000000000..520b8304f63f
--- /dev/null
+++ b/pkgs/applications/misc/gxneur/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }:
+
+stdenv.mkDerivation {
+  name = "gxneur-0.13.0";
+  
+  src = fetchurl {
+    url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2;
+    sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f";
+  };
+
+  buildInputs = [
+    xorg.libX11 pkgconfig  glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
+    libglade GConf pcre
+  ];
+
+  preConfigure = ''
+    sed -e 's@-Werror@@' -i configure
+    sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c
+  '';
+
+  meta = {
+    description = "GUI for XNEUR keyboard layout switcher";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5c331aa5a89..50be081452bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7819,10 +7819,16 @@ let
 
   xineUI = callPackage ../applications/video/xine-ui { };
 
-  xneur = callPackage ../applications/misc/xneur { };
+  xneur_0_13 = callPackage ../applications/misc/xneur { };
 
   xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { };
 
+  xneur = xneur_0_13;
+
+  gxneur = callPackage ../applications/misc/gxneur  {
+    inherit (gnome) libglade GConf;
+  };
+
   xournal = callPackage ../applications/graphics/xournal {
     inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas;
   };

From 7ef3f9dd2a757e29f9a11ec95d9a5a4a196c5b08 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Sun, 12 Feb 2012 15:06:32 +0400
Subject: [PATCH 3/3] xfce-gvfs: add fuse to buildInputs

Passing fuse to gvfs results in building gvfs-fuse-daemon, which makes
it possible to access gvfs mounts via ~/.gvfs folder.
---
 pkgs/desktops/xfce-4.8/support/gvfs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix
index 6e50e6825dd6..33f7315a9d9b 100644
--- a/pkgs/desktops/xfce-4.8/support/gvfs.nix
+++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu }:
+{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse }:
 
 stdenv.mkDerivation rec {
   name = "gvfs-1.8.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
   };
 
-  buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu ];
+  buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu fuse ];
 
   meta = {
     description = "Virtual Filesystem support library (for Xfce)";