diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index f3fdea59e48..0cb554480a1 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,41 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, intltool, pythonPackages -, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup, glib_networking -, webkitgtk, json_glib, gobjectIntrospection, gst_all_1 -, libnotify -, makeWrapper +{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook +, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1 +, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg +, gobjectIntrospection, glib_networking }: let pname = "liferea"; - version = "1.10.19"; - inherit (pythonPackages) python pygobject3; + version = "1.12-rc2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "1h6x8xd4ldrgw9mbf2gwf7wxi6z34h0d0rnwy9kyskdcgkymvi80"; + sha256 = "1q83s900skl0w9pb0afq8z387ynhl0rqn6fmps8wmncj0z1q07wb"; }; - buildInputs = with gst_all_1; [ - pkgconfig intltool python - glib gnome3.gtk pango libxml2 libxslt sqlite libsoup - webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas - gnome3.libpeas gnome3.dconf - gst-plugins-base gst-plugins-good gst-plugins-bad - gnome3.libgnome_keyring gnome3.defaultIconTheme - libnotify - makeWrapper - ]; + nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; + + buildInputs = [ + glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas + libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection + librsvg glib_networking + ] ++ (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad + ]); + + pythonPath = with python3Packages; [ pygobject3 pycairo ]; preFixup = '' - for f in "$out"/bin/*; do - wrapProgram "$f" \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43743b5c83b..0fdaf8e4d10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14263,7 +14263,7 @@ with pkgs; liferea = callPackage ../applications/networking/newsreaders/liferea { - webkitgtk = webkitgtk24x; + inherit (gnome3) libpeas gsettings_desktop_schemas dconf; }; lingot = callPackage ../applications/audio/lingot {