diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-09-05 00:52:36 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 21:34:40 +0100 |
commit | ade896e8a9fd3b140c144a845ea13f7a9f994074 (patch) | |
tree | ff6ef564f95c51963f29f8677936d14953207203 /pkgs/desktops/gnome-3/core/sushi | |
parent | bcc8e6d2a9eb849a49b095bd6abdb955b02bde4f (diff) | |
download | nixpkgs-ade896e8a9fd3b140c144a845ea13f7a9f994074.tar nixpkgs-ade896e8a9fd3b140c144a845ea13f7a9f994074.tar.gz nixpkgs-ade896e8a9fd3b140c144a845ea13f7a9f994074.tar.bz2 nixpkgs-ade896e8a9fd3b140c144a845ea13f7a9f994074.tar.lz nixpkgs-ade896e8a9fd3b140c144a845ea13f7a9f994074.tar.xz nixpkgs-ade896e8a9fd3b140c144a845ea13f7a9f994074.tar.zst nixpkgs-ade896e8a9fd3b140c144a845ea13f7a9f994074.zip |
gnome3.sushi: 3.28.3 → 3.30.0
Diffstat (limited to 'pkgs/desktops/gnome-3/core/sushi')
-rw-r--r-- | pkgs/desktops/gnome-3/core/sushi/default.nix | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 1881293a213..c8dbe58e2c2 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,45 +1,35 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter-gtk, clutter-gst, gnome3, gtksourceview -, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 +, clutter-gtk, clutter-gst, gnome3, aspell, hspell, gtksourceview, gjs +, webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1 , gdk_pixbuf, librsvg, gtk3, harfbuzz }: stdenv.mkDerivation rec { name = "sushi-${version}"; - version = "3.28.3"; + version = "3.30.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yydd34q7r05z0jdgym3r4f8jv8snrcvvhxw0vxn6damlvj5lbiw"; + sha256 = "0zpaiw5r734fky3zq95a6szwn7srbkpixajqg2xvdivhhx4mbnnj"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "sushi"; attrPath = "gnome3.sushi"; }; - }; - - propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file intltool gobjectIntrospection glib gtk3 - clutter-gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf - librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk - gnome3.evince icu makeWrapper harfbuzz ]; + nativeBuildInputs = [ pkgconfig file intltool gobjectIntrospection wrapGAppsHook ]; + buildInputs = [ + glib gtk3 gnome3.evince icu harfbuzz + clutter-gtk clutter-gst gjs gtksourceview gdk_pixbuf + librsvg libmusicbrainz5 webkitgtk + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + # cannot find -laspell, -lhspell + aspell hspell + ]; enableParallelBuilding = true; - postConfigure = '' - substituteInPlace src/libsushi/sushi-font-widget.h \ - --replace "<hb-ft.h>" "<harfbuzz/hb-ft.h>" - substituteInPlace src/libsushi/sushi-font-widget.c \ - --replace "<hb-glib.h>" "<harfbuzz/hb-glib.h>" - ''; - - preFixup = '' - wrapProgram $out/libexec/sushi-start \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "sushi"; + attrPath = "gnome3.sushi"; + }; + }; meta = with stdenv.lib; { homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; |