From a9dbcdb6269a68fdce7b229f9ce98f8b241cd60b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 14 Mar 2018 04:48:34 +0100 Subject: gtksourceview4: init at 4.0.0 --- pkgs/desktops/gnome-3/default.nix | 2 +- .../gtksourceview/4.x-nix_share_path.patch | 11 +++++ pkgs/development/libraries/gtksourceview/4.x.nix | 54 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch create mode 100644 pkgs/development/libraries/gtksourceview/4.x.nix diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 03a2f91c1fa..5fe7f25b61e 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -53,7 +53,7 @@ let ]; inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview + libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 easytag meld orca rhythmbox shotwell clutter clutter-gst clutter-gtk cogl gtkvnc; diff --git a/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch b/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch new file mode 100644 index 00000000000..a35d9a88d0d --- /dev/null +++ b/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch @@ -0,0 +1,11 @@ +--- a/gtksourceview/gtksourceutils.c ++++ b/gtksourceview/gtksourceutils.c +@@ -232,6 +232,8 @@ + NULL)); + } + ++ g_ptr_array_add (dirs, g_build_filename (DATADIR, GSV_DATA_SUBDIR, basename, NULL)); ++ + g_ptr_array_add (dirs, NULL); + + return (gchar **) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix new file mode 100644 index 00000000000..2501e0253b3 --- /dev/null +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40 +, libxml2, perl, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }: + +let + checkInputs = [ xvfb_run dbus ]; +in stdenv.mkDerivation rec { + name = "gtksourceview-${version}"; + version = "4.0.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0amkspjsvxr3rjznmnwjwsgw030hayf6bw49ya4nligslwl7lp3f"; + }; + + propagatedBuildInputs = [ + # Required by gtksourceview-4.0.pc + gtk3 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig gettext perl gobjectIntrospection vala_0_40 ] + ++ stdenv.lib.optionals doCheck checkInputs; + + buildInputs = [ atk cairo glib pango libxml2 ]; + + patches = [ ./4.x-nix_share_path.patch ]; + + enableParallelBuilding = true; + + doCheck = stdenv.isLinux; + 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 + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtksourceview"; + attrPath = "gnome3.gtksourceview"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GtkSourceView; + platforms = with platforms; linux ++ darwin; + license = licenses.lgpl21; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ed1b750c91..850b09631f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9234,6 +9234,8 @@ with pkgs; gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { }; + gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; -- cgit 1.4.1