Skip to content

Commit 42cc251

Browse files
authored
mate.libmateweather: build against libsoup_3 (NixOS#398828)
2 parents 6874529 + 1413379 commit 42cc251

File tree

2 files changed

+587
-4
lines changed

2 files changed

+587
-4
lines changed

pkgs/desktops/mate/libmateweather/default.nix

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
lib,
33
stdenv,
4+
autoreconfHook,
45
fetchurl,
56
pkg-config,
67
gettext,
78
glib,
89
glib-networking,
910
libxml2,
1011
gtk3,
11-
libsoup_2_4,
12+
gtk-doc,
13+
libsoup_3,
1214
tzdata,
1315
mateUpdateScript,
1416
}:
15-
1617
stdenv.mkDerivation rec {
1718
pname = "libmateweather";
1819
version = "1.28.0";
@@ -22,17 +23,25 @@ stdenv.mkDerivation rec {
2223
sha256 = "VUNz3rWzk7nYSydd0spmyaSi0ObskgRPq4qlPjAy0rU=";
2324
};
2425

26+
patches = [
27+
# https://github.com/mate-desktop/libmateweather/pull/133
28+
./libsoup_3_support.patch
29+
];
30+
2531
strictDeps = true;
2632

2733
nativeBuildInputs = [
34+
autoreconfHook # the libsoup patch changes the autoconf file
2835
pkg-config
2936
gettext
3037
glib # glib-compile-schemas
38+
gtk-doc # required for autoconf
3139
libxml2 # xmllint
3240
];
3341

3442
buildInputs = [
35-
libsoup_2_4
43+
libxml2
44+
libsoup_3
3645
tzdata
3746
];
3847

@@ -44,7 +53,6 @@ stdenv.mkDerivation rec {
4453

4554
configureFlags = [
4655
"--with-zoneinfo-dir=${tzdata}/share/zoneinfo"
47-
"--enable-locations-compression"
4856
];
4957

5058
preFixup = "rm -f $out/share/icons/mate/icon-theme.cache";

0 commit comments

Comments
 (0)