b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gupnp: fix compilation

Browse source 
meson 1.1.1 -> 1.2.0 had a few breaking changes.
upstream fixed it on both the main 1.6 and legacy 1.4 branches,
but only published a release for `gupnp_1_6`: for the legacy `gupnp` we
have to cherry-pick that fix.
This commit is contained in:
Colin 2023-07-31 23:17:02 +00:00
parent 8181d9443b
commit aa6f3286bc
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/gupnp/default.nix
View file

@ -35,9 +35,18 @@ stdenv.mkDerivation rec {
# Bring .pc file in line with our patched pkg-config.
./0001-pkg-config-Declare-header-dependencies-as-public.patch
# Unbreak build with Meson 1.2.0
# https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/33
(fetchpatch2 {
name = "meson-1.2-fix.patch";
url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/85c0244cfbf933d3e90d50ab68394c68d86f9ed5.patch";
hash = "sha256-poDhkEgDTpgGnTbbZLPwx8Alf0h81vmzJyx3izWmDGw=";
})
# Fix build against libxml2 2.11
# https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34
(fetchpatch2 {
name = "libxml2-2.11-fix.patch";
url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch";
hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY=";
})