diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-28 06:30:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-28 06:30:19 +0000 |
| commit | 7ce9e536ae7aa6a76b50f84c2f1012dd801d4e95 (patch) | |
| tree | 1c66f61a977afed470849e731b36789c03e83681 /pkgs | |
| parent | c5ed4a8b2902aaf519f037742cae03f224f0cc1a (diff) | |
| parent | e192b0e0af3df2d2f4cbdebf64ee506082d72447 (diff) | |
Merge pull request #72096 from jtojnar/sushi-fix
gnome3.sushi: fix module loading
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/sushi/default.nix | 65 |
1 files changed, 56 insertions, 9 deletions
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index fc4034acf6607..2d6d398fb4597 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,7 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib -, clutter-gtk, clutter-gst, gnome3, gtksourceview4, gjs -, webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1 -, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja, epoxy }: +{ stdenv +, fetchurl +, pkgconfig +, meson +, gettext +, gobject-introspection +, glib +, clutter-gtk +, clutter-gst +, gnome3 +, gtksourceview4 +, gjs +, webkitgtk +, libmusicbrainz5 +, icu +, wrapGAppsHook +, gst_all_1 +, gdk-pixbuf +, librsvg +, gtk3 +, harfbuzz +, ninja +, epoxy +}: stdenv.mkDerivation rec { pname = "sushi"; @@ -13,15 +33,42 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig meson ninja gettext gobject-introspection wrapGAppsHook + pkgconfig + meson + ninja + gettext + gobject-introspection + wrapGAppsHook ]; buildInputs = [ - glib gtk3 gnome3.evince icu harfbuzz - clutter-gtk clutter-gst gjs gtksourceview4 gdk-pixbuf - librsvg libmusicbrainz5 webkitgtk epoxy - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + glib + gtk3 + gnome3.evince + icu + harfbuzz + clutter-gtk + clutter-gst + gjs + gtksourceview4 + gdk-pixbuf + librsvg + libmusicbrainz5 + webkitgtk + epoxy + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ]; + # See https://github.com/NixOS/nixpkgs/issues/31168 + postInstall = '' + for file in $out/libexec/org.gnome.NautilusPreviewer + do + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + done + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "sushi"; |