diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-25 13:42:17 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-25 15:57:24 +0200 |
| commit | d6a6f9eb95a778b3267c180d959984bdb1763f19 (patch) | |
| tree | 0c622e02437f7e97ad451c4542511cddd6747bd7 /pkgs/desktops/gnome-3 | |
| parent | 40535ced631b3d7ef95a3235b7a64b20a97aecca (diff) | |
| download | nixlib-d6a6f9eb95a778b3267c180d959984bdb1763f19.tar nixlib-d6a6f9eb95a778b3267c180d959984bdb1763f19.tar.gz nixlib-d6a6f9eb95a778b3267c180d959984bdb1763f19.tar.bz2 nixlib-d6a6f9eb95a778b3267c180d959984bdb1763f19.tar.lz nixlib-d6a6f9eb95a778b3267c180d959984bdb1763f19.tar.xz nixlib-d6a6f9eb95a778b3267c180d959984bdb1763f19.tar.zst nixlib-d6a6f9eb95a778b3267c180d959984bdb1763f19.zip | |
gnome3.caribou: fix on GNOME Flashback
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/caribou/default.nix | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index 48be01faf33f..acfd6dfb3745 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,11 +1,11 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2 +{ fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook }: let pname = "caribou"; version = "0.4.21"; - pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); + pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,11 +14,21 @@ in stdenv.mkDerivation rec { sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; + patches = [ + # Fix crash in GNOME Flashback + # https://bugzilla.gnome.org/show_bug.cgi?id=791001 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=364774; + sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; - buildInputs = with gnome3; - [ glib gtk clutter at-spi2-core dbus pythonEnv python3Packages.pygobject3 - libXtst gtk2 ]; + buildInputs = [ + glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 + libXtst gtk2 + ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; @@ -37,9 +47,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An input assistive technology intended for switch and pointer users"; homepage = https://wiki.gnome.org/Projects/Caribou; - platforms = platforms.linux; license = licenses.lgpl21; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } |