Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a61791125433
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1dac7f4d012c
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 10, 2021

  1. dasher: 2018-04-03 -> unstable-2021-04-25

    @moni-dz
    moni-dz committed May 10, 2021
    Copy the full SHA
    675c412 View commit details

Commits on May 16, 2021

  1. dasher: enableParallelBuilding = true 

    I'm a bit impatient :-)  and this seems to build without issues,
even on an idle 32-threaded machine.
    @vcunat
    vcunat committed May 16, 2021
    Copy the full SHA
    9018f5e View commit details

  2. Merge #122470: dasher: 2018-04-03 -> unstable-2021-04-25

    @vcunat
    vcunat committed May 16, 2021
    2
    Copy the full SHA
    1dac7f4 View commit details
Showing with 33 additions and 18 deletions.
  1. +33 −18 pkgs/applications/accessibility/dasher/default.nix
51 changes: 33 additions & 18 deletions pkgs/applications/accessibility/dasher/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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,27 @@ 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;

enableParallelBuilding = true;

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

}