MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xneur: 0.13.0 → 0.20.0

Browse source
This commit is contained in:
Jan Tojnar 2018-07-16 01:33:57 +02:00
parent 311f017066
commit f5831fb66b
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
5 changed files with 27 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/gxneur/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }: { stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur, libglade, GConf, pcre }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gxneur-0.13.0"; name = "gxneur-0.13.0";
@ -10,13 +10,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ 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 libglade GConf pcre
]; ];
preConfigure = '' preConfigure = ''
sed -e 's@-Werror@@' -i configure 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 = { meta = {

51
pkgs/applications/misc/xneur/default.nix
View file

@ -1,44 +1,35 @@
{ stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2 { stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib
, aspell, cairo, imlib2, xosd, libnotify, gtk2, pango, atk, enchant, , xosd, libnotify, enchant, wrapGAppsHook, gdk_pixbuf }:
gdk_pixbuf}:
let s = import ./src-for-default.nix; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (s) version name; name = "xneur-${version}";
version = "0.20.0";
src = fetchurl { src = fetchurl {
inherit(s) url; url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz";
sha256 = s.hash; sha256 = "1lg3qpi9pkx9f5xvfc8yf39wwc98f769yb7i2438vqn66kla1xpr";
}; };
buildInputs = nativeBuildInputs = [
[ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo pkgconfig intltool wrapGAppsHook
xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
gtk2 pango enchant gdk_pixbuf
]; ];
preConfigure = '' buildInputs = [
sed -e 's/-Werror//' -i configure xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib
sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure xosd xorg.libXext xorg.libXi libnotify
sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure enchant gdk_pixbuf
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
postPatch = ''
sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
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"
''; '';
meta = { meta = with stdenv.lib; {
description = "Utility for switching between keyboard layouts"; description = "Utility for switching between keyboard layouts";
homepage = https://xneur.ru; homepage = https://xneur.ru;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.raskin ]; maintainers = [ maintainers.raskin ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

9
pkgs/applications/misc/xneur/src-for-default.nix
View file

@ -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";
}

5
pkgs/applications/misc/xneur/src-info-for-default.nix
View file

@ -1,5 +0,0 @@
{
downloadPage = "http://xneur.ru/downloads";
baseName = "xneur";
versionReferenceCreator = "$(replaceAllVersionOccurences)";
}

4
pkgs/top-level/all-packages.nix
View file

@ -19152,12 +19152,10 @@ with pkgs;
xmind = callPackage ../applications/misc/xmind { }; 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_0_8 = callPackage ../applications/misc/xneur/0.8.nix { };
xneur = xneur_0_13;
gxneur = callPackage ../applications/misc/gxneur { gxneur = callPackage ../applications/misc/gxneur {
inherit (gnome2) libglade GConf; inherit (gnome2) libglade GConf;
}; };