diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index a3946444948..363cf1a0c4a 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -1,14 +1,22 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext, gnome3 }: +, libxml2, perl, intltool, gettext, gnome3, dbus, xvfb_run, shared_mime_info }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ + # Required by gtksourceview-3.0.pc + gtk3 + # Used by gtk_source_language_manager_guess_language + shared_mime_info + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ atk cairo glib pango - libxml2Python perl intltool gettext ]; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig intltool gettext perl ] + ++ stdenv.lib.optionals doCheck checkInputs; + buildInputs = [ atk cairo glib pango libxml2 ]; + checkInputs = [ xvfb_run dbus ]; preBuild = '' substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" @@ -16,6 +24,14 @@ stdenv.mkDerivation rec { patches = [ ./nix_share_path.patch ]; + doCheck = true; + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + meta = with stdenv.lib; { platforms = with platforms; linux ++ darwin; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix index a8cdf8906d4..ec7a8a6aaa5 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gtksourceview-3.24.5"; + name = "gtksourceview-3.24.6"; src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.5.tar.xz; - sha256 = "0246185fcc20c4734d01419a83f58f251a82e2a902fe60bb0335187fcf658181"; + url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz; + sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; }; }