pyrox.dev / nixpkgs
lol
fork atom

libgweather: 40.0 → 3.91.0

Yes, this is an upgrade.

https://gitlab.gnome.org/GNOME/libgweather/-/tags/3.90.0
https://gitlab.gnome.org/GNOME/libgweather/-/tags/3.91.0

Jan Tojnar 4be046c3 9649427f

+33 -14
unified split
+19 -14
pkgs/development/libraries/libgweather/default.nix
··· 6 , pkg-config 7 , libxml2 8 , glib 9 - , gtk3 10 , gettext 11 , libsoup 12 - , gtk-doc 13 - , docbook-xsl-nons 14 - , docbook_xml_dtd_43 15 , gobject-introspection 16 , python3 17 , tzdata ··· 22 23 stdenv.mkDerivation rec { 24 pname = "libgweather"; 25 - version = "40.0"; 26 27 outputs = [ "out" "dev" "devdoc" ]; 28 29 src = fetchurl { 30 - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; 31 - sha256 = "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna"; 32 }; 33 34 nativeBuildInputs = [ 35 meson 36 ninja 37 pkg-config 38 gettext 39 vala 40 - gtk-doc 41 - docbook-xsl-nons 42 - docbook_xml_dtd_43 43 gobject-introspection 44 python3 45 python3.pkgs.pygobject3 ··· 47 48 buildInputs = [ 49 glib 50 - gtk3 51 libsoup 52 libxml2 53 geocode-glib ··· 60 ]; 61 62 postPatch = '' 63 - chmod +x meson/meson_post_install.py 64 - patchShebangs meson/meson_post_install.py 65 - patchShebangs data/gen_locations_variant.py 66 ''; 67 68 passthru = {
··· 6 , pkg-config 7 , libxml2 8 , glib 9 , gettext 10 , libsoup 11 + , gi-docgen 12 , gobject-introspection 13 , python3 14 , tzdata ··· 19 20 stdenv.mkDerivation rec { 21 pname = "libgweather"; 22 + version = "3.91.0"; 23 24 outputs = [ "out" "dev" "devdoc" ]; 25 26 src = fetchurl { 27 + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 28 + sha256 = "cls+s0/G0h7cgLbmhHKLMIix+hRPCipNPpYFx6jz3Pg="; 29 }; 30 31 + patches = [ 32 + # Headers depend on glib but it is only listed in Requires.private, 33 + # which does not influence Cflags on non-static builds in nixpkgs’s 34 + # pkg-config. Let’s add it to Requires to ensure Cflags are set correctly. 35 + ./fix-pkgconfig.patch 36 + ]; 37 + 38 nativeBuildInputs = [ 39 meson 40 ninja 41 pkg-config 42 gettext 43 vala 44 + gi-docgen 45 gobject-introspection 46 python3 47 python3.pkgs.pygobject3 ··· 49 50 buildInputs = [ 51 glib 52 libsoup 53 libxml2 54 geocode-glib ··· 61 ]; 62 63 postPatch = '' 64 + patchShebangs build-aux/meson/meson_post_install.py 65 + patchShebangs build-aux/meson/gen_locations_variant.py 66 + ''; 67 + 68 + postFixup = '' 69 + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. 70 + moveToOutput "share/doc" "$devdoc" 71 ''; 72 73 passthru = {
+14
pkgs/development/libraries/libgweather/fix-pkgconfig.patch
···
··· 1 + diff --git a/libgweather/meson.build b/libgweather/meson.build 2 + index b5d0b4d4..10010d70 100644 3 + --- a/libgweather/meson.build 4 + +++ b/libgweather/meson.build 5 + @@ -269,6 +269,9 @@ pkgconfig.generate( 6 + description: 'Gather weather information from online services', 7 + version: meson.project_version(), 8 + subdirs: libgweather_full_version, 9 + + requires: [ 10 + + 'glib-2.0', 11 + + ], 12 + variables: [ 13 + 'soupapiversion=' + libsoup_api_version, 14 + ]