From 675c4123bb08560b708f4606a980e61a83c25eea Mon Sep 17 00:00:00 2001
From: fortuneteller2k <lythe1107@gmail.com>
Date: Tue, 11 May 2021 00:45:40 +0800
Subject: [PATCH 1/2] dasher: 2018-04-03 -> unstable-2021-04-25

---
 .../accessibility/dasher/default.nix          | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix
index fe0d8fe8634..6f2a185b309 100644
--- a/pkgs/applications/accessibility/dasher/default.nix
+++ b/pkgs/applications/accessibility/dasher/default.nix
@@ -1,22 +1,33 @@
-{ stdenv, lib, fetchFromGitHub
-, autoreconfHook, pkg-config, wrapGAppsHook
-, glib, gtk3, expat, gnome-doc-utils, which
-, at-spi2-core, dbus
-, libxslt, libxml2
-, speechSupport ? true, speechd ? null
+{ stdenv
+, lib
+, fetchFromGitLab
+, autoreconfHook
+, pkg-config
+, wrapGAppsHook
+, glib
+, gtk3
+, expat
+, itstool
+, gnome-doc-utils
+, which
+, at-spi2-core
+, dbus
+, libxslt
+, libxml2
+, speechSupport ? true
+, speechd
 }:
 
-assert speechSupport -> speechd != null;
-
 stdenv.mkDerivation {
   pname = "dasher";
-  version = "2018-04-03";
+  version = "unstable-2021-04-25";
 
-  src = fetchFromGitHub {
-    owner = "dasher-project";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
     repo = "dasher";
-    rev = "9ab12462e51d17a38c0ddc7f7ffe1cb5fe83b627";
-    sha256 = "1r9xn966nx3pv2bidd6i3pxmprvlw6insnsb38zabmac609h9d9s";
+    rev = "90c753b87564fa3f42cb2d04e1eb6662dc8e0f8f";
+    sha256 = "sha256-aM05CV68pCRlhfIPyhuHWeRL+tDroB3fVsoX08OU8hY=";
   };
 
   prePatch = ''
@@ -33,23 +44,25 @@ stdenv.mkDerivation {
     # doc generation
     gnome-doc-utils
     which
-    libxslt libxml2
+    libxslt
+    libxml2
   ];
 
   buildInputs = [
     glib
     gtk3
     expat
+    itstool
     # at-spi2 needs dbus to be recognized by pkg-config
-    at-spi2-core dbus
+    at-spi2-core
+    dbus
   ] ++ lib.optional speechSupport speechd;
 
   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";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.Profpatsch ];
     platforms = lib.platforms.all;
   };
-
 }

From 9018f5eb0148cc500e786906d8109e2cafe30878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 16 May 2021 10:46:09 +0200
Subject: [PATCH 2/2] dasher: enableParallelBuilding = true

I'm a bit impatient :-)  and this seems to build without issues,
even on an idle 32-threaded machine.
---
 pkgs/applications/accessibility/dasher/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix
index 6f2a185b309..328ff2c5c57 100644
--- a/pkgs/applications/accessibility/dasher/default.nix
+++ b/pkgs/applications/accessibility/dasher/default.nix
@@ -58,6 +58,8 @@ stdenv.mkDerivation {
     dbus
   ] ++ lib.optional speechSupport speechd;
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = "https://www.inference.org.uk/dasher/";
     description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures";