diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index 420fd62b68d6..3ae26029e889 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -2,19 +2,20 @@ lib, stdenv, fetchurl, + fetchpatch, gettext, pkg-config, + xfce4-dev-tools, glib, gtk3, json_c, libxml2, - libsoup_2_4, + libsoup_3, upower, libxfce4ui, libxfce4util, xfce4-panel, xfconf, - hicolor-icon-theme, gitUpdater, }: @@ -31,9 +32,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-AC0f5jkG0vOgEvPLWMzv8d+8xGZ1njbHbTsD3QHA3Fc="; }; + patches = [ + # Port to libsoup-3.0 + # https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/merge_requests/28 + (fetchpatch { + url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/c0653a903c6f2cecdf41ac9eaeba4f4617656ffe.patch"; + hash = "sha256-wAowm4ppBSKvYwOowZbbs5pnTh9EQ9XX05lA81wtsRM="; + }) + (fetchpatch { + url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/279c975dc1f95bd1ce9152eee1d19122e7deb9a8.patch"; + hash = "sha256-gVfyXkE0bjBfvcQU9fDp+Gm59bD3VbAam04Jak8i31k="; + }) + ]; + nativeBuildInputs = [ gettext pkg-config + xfce4-dev-tools ]; buildInputs = [ @@ -41,15 +56,16 @@ stdenv.mkDerivation rec { gtk3 json_c libxml2 - libsoup_2_4 + libsoup_3 upower libxfce4ui libxfce4util xfce4-panel xfconf - hicolor-icon-theme ]; + configureFlags = [ "--enable-maintainer-mode" ]; + enableParallelBuilding = true; passthru.updateScript = gitUpdater {