Merge #122470: dasher: 2018-04-03 -> unstable-2021-04-25
This commit is contained in:
commit
1dac7f4d01
@ -1,22 +1,33 @@
|
|||||||
{ stdenv, lib, fetchFromGitHub
|
{ stdenv
|
||||||
, autoreconfHook, pkg-config, wrapGAppsHook
|
, lib
|
||||||
, glib, gtk3, expat, gnome-doc-utils, which
|
, fetchFromGitLab
|
||||||
, at-spi2-core, dbus
|
, autoreconfHook
|
||||||
, libxslt, libxml2
|
, pkg-config
|
||||||
, speechSupport ? true, speechd ? null
|
, wrapGAppsHook
|
||||||
|
, glib
|
||||||
|
, gtk3
|
||||||
|
, expat
|
||||||
|
, itstool
|
||||||
|
, gnome-doc-utils
|
||||||
|
, which
|
||||||
|
, at-spi2-core
|
||||||
|
, dbus
|
||||||
|
, libxslt
|
||||||
|
, libxml2
|
||||||
|
, speechSupport ? true
|
||||||
|
, speechd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert speechSupport -> speechd != null;
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "dasher";
|
pname = "dasher";
|
||||||
version = "2018-04-03";
|
version = "unstable-2021-04-25";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitLab {
|
||||||
owner = "dasher-project";
|
domain = "gitlab.gnome.org";
|
||||||
|
owner = "GNOME";
|
||||||
repo = "dasher";
|
repo = "dasher";
|
||||||
rev = "9ab12462e51d17a38c0ddc7f7ffe1cb5fe83b627";
|
rev = "90c753b87564fa3f42cb2d04e1eb6662dc8e0f8f";
|
||||||
sha256 = "1r9xn966nx3pv2bidd6i3pxmprvlw6insnsb38zabmac609h9d9s";
|
sha256 = "sha256-aM05CV68pCRlhfIPyhuHWeRL+tDroB3fVsoX08OU8hY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
@ -33,23 +44,27 @@ stdenv.mkDerivation {
|
|||||||
# doc generation
|
# doc generation
|
||||||
gnome-doc-utils
|
gnome-doc-utils
|
||||||
which
|
which
|
||||||
libxslt libxml2
|
libxslt
|
||||||
|
libxml2
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib
|
glib
|
||||||
gtk3
|
gtk3
|
||||||
expat
|
expat
|
||||||
|
itstool
|
||||||
# at-spi2 needs dbus to be recognized by pkg-config
|
# at-spi2 needs dbus to be recognized by pkg-config
|
||||||
at-spi2-core dbus
|
at-spi2-core
|
||||||
|
dbus
|
||||||
] ++ lib.optional speechSupport speechd;
|
] ++ lib.optional speechSupport speechd;
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://www.inference.org.uk/dasher/";
|
homepage = "https://www.inference.org.uk/dasher/";
|
||||||
description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures";
|
description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures";
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2Only;
|
||||||
maintainers = [ lib.maintainers.Profpatsch ];
|
maintainers = [ lib.maintainers.Profpatsch ];
|
||||||
platforms = lib.platforms.all;
|
platforms = lib.platforms.all;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user