xneur: 0.13.0 → 0.20.0

5 files changed, 27 insertions, 52 deletions

diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix
index 69c91d25755..940b0a7252f 100644
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/pkgs/applications/misc/gxneur/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }:
+{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur, libglade, GConf, pcre }:
 
 stdenv.mkDerivation {
   name = "gxneur-0.13.0";
-  
+
   src = fetchurl {
     url = https://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2;
     sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f";
@@ -10,13 +10,13 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
+    xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur
     libglade GConf pcre
   ];
 
   preConfigure = ''
     sed -e 's@-Werror@@' -i configure
-    sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c
+    sed -e 's@"xneur"@"${xneur}/bin/xneur"@' -i src/misc.c
   '';
 
   meta = {
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index ff7c6a9e976..c6438a21f2c 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,44 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2
-, aspell, cairo, imlib2, xosd, libnotify, gtk2, pango, atk, enchant,
- gdk_pixbuf}:
-
-let s = import ./src-for-default.nix; in
+{ stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib
+, xosd, libnotify, enchant, wrapGAppsHook, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  inherit (s) version name;
+   name = "xneur-${version}";
+   version = "0.20.0";
+
   src = fetchurl {
-    inherit(s) url;
-    sha256 = s.hash;
+    url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz";
+    sha256 = "1lg3qpi9pkx9f5xvfc8yf39wwc98f769yb7i2438vqn66kla1xpr";
   };
 
-  buildInputs =
-    [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo
-      xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
-      gtk2 pango enchant gdk_pixbuf
-    ];
+  nativeBuildInputs = [
+    pkgconfig intltool wrapGAppsHook
+  ];
 
-  preConfigure = ''
-    sed -e 's/-Werror//' -i configure
-    sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure
-    sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure
-    sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
+  buildInputs = [
+    xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib
+    xosd xorg.libXext xorg.libXi libnotify
+    enchant gdk_pixbuf
+    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+  ];
 
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.dev}/include/gtk-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.out}/lib/gtk-2.0/include"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/include"
-
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify"
+  postPatch = ''
+    sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Utility for switching between keyboard layouts";
     homepage = https://xneur.ru;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix
deleted file mode 100644
index a7db13bd81d..00000000000
--- a/pkgs/applications/misc/xneur/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="0.13.0";
-   name="xneur-0.13.0";
-   hash="19z8nnfj9paf877k0nrqy6dih69l81svxymqg6llh7ndgkw20hgd";
-   url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2";
-   advertisedUrl="http://dists.xneur.ru/release-0.13.0/tgz/xneur-0.13.0.tar.bz2";
-  
-  
-}
diff --git a/pkgs/applications/misc/xneur/src-info-for-default.nix b/pkgs/applications/misc/xneur/src-info-for-default.nix
deleted file mode 100644
index 0de3e83baf7..00000000000
--- a/pkgs/applications/misc/xneur/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://xneur.ru/downloads";
-  baseName = "xneur";
-  versionReferenceCreator = "$(replaceAllVersionOccurences)";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e58f106d69..1dc645ff61c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19152,12 +19152,10 @@ with pkgs;
 
   xmind = callPackage ../applications/misc/xmind { };
 
-  xneur_0_13 = callPackage ../applications/misc/xneur { };
+  xneur = callPackage ../applications/misc/xneur { };
 
   xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { };
 
-  xneur = xneur_0_13;
-
   gxneur = callPackage ../applications/misc/gxneur  {
     inherit (gnome2) libglade GConf;
   };