From dfd6f3de1954fa1ba69fffe42101e1d95141388b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 4 Jun 2020 23:25:54 +0200 Subject: [PATCH] liferea: Format with nixpkgs-fmt * Format with nixpkgs-fmt * Replace pkgconfig alias with pkg-config * Remove duplicate gsettings-desktop-schemas --- .../newsreaders/liferea/default.nix | 61 ++++++++++++++++--- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 816e00447a0..ddea4754c53 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,7 +1,25 @@ -{ 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 -, gobject-introspection, glib-networking +{ stdenv +, fetchurl +, pkg-config +, intltool +, python3Packages +, wrapGAppsHook +, glib +, libxml2 +, libxslt +, sqlite +, libsoup +, webkitgtk +, json-glib +, gst_all_1 +, libnotify +, gtk3 +, gsettings-desktop-schemas +, libpeas +, dconf +, librsvg +, gobject-introspection +, glib-networking }: stdenv.mkDerivation rec { @@ -13,17 +31,40 @@ stdenv.mkDerivation rec { sha256 = "03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d"; }; - nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; + nativeBuildInputs = [ + wrapGAppsHook + python3Packages.wrapPython + intltool + pkg-config + ]; buildInputs = [ - glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas - libpeas gsettings-desktop-schemas json-glib dconf gobject-introspection - librsvg glib-networking libnotify + glib + gtk3 + webkitgtk + libxml2 + libxslt + sqlite + libsoup + libpeas + gsettings-desktop-schemas + json-glib + dconf + gobject-introspection + librsvg + glib-networking + libnotify ] ++ (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad ]); - pythonPath = with python3Packages; [ pygobject3 pycairo ]; + pythonPath = with python3Packages; [ + pygobject3 + pycairo + ]; preFixup = '' buildPythonPath "$out $pythonPath"