pyrox.dev
lol
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
+19
-14
pkgs/development/libraries/libgweather/default.nix
+19
-14
pkgs/development/libraries/libgweather/default.nix
···
6
6
, pkg-config
7
7
, libxml2
8
8
, glib
9
-
, gtk3
10
9
, gettext
11
10
, libsoup
12
-
, gtk-doc
13
-
, docbook-xsl-nons
14
-
, docbook_xml_dtd_43
11
+
, gi-docgen
15
12
, gobject-introspection
16
13
, python3
17
14
, tzdata
···
22
19
23
20
stdenv.mkDerivation rec {
24
21
pname = "libgweather";
25
-
version = "40.0";
22
+
version = "3.91.0";
26
23
27
24
outputs = [ "out" "dev" "devdoc" ];
28
25
29
26
src = fetchurl {
30
-
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
31
-
sha256 = "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna";
27
+
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
28
+
sha256 = "cls+s0/G0h7cgLbmhHKLMIix+hRPCipNPpYFx6jz3Pg=";
32
29
};
33
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
+
34
38
nativeBuildInputs = [
35
39
meson
36
40
ninja
37
41
pkg-config
38
42
gettext
39
43
vala
40
-
gtk-doc
41
-
docbook-xsl-nons
42
-
docbook_xml_dtd_43
44
+
gi-docgen
43
45
gobject-introspection
44
46
python3
45
47
python3.pkgs.pygobject3
···
47
49
48
50
buildInputs = [
49
51
glib
50
-
gtk3
51
52
libsoup
52
53
libxml2
53
54
geocode-glib
···
60
61
];
61
62
62
63
postPatch = ''
63
-
chmod +x meson/meson_post_install.py
64
-
patchShebangs meson/meson_post_install.py
65
-
patchShebangs data/gen_locations_variant.py
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"
66
71
'';
67
72
68
73
passthru = {
+14
pkgs/development/libraries/libgweather/fix-pkgconfig.patch
+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
+
]