Merge pull request #246931 from uninsane/pr-fix-gupnp

gupnp, gupnp_1_6: fix compilation

authored by

Bobby Rong and committed by
GitHub
0e46c9c0 f9497b22

+11 -2
+2 -2
pkgs/development/libraries/gupnp/1.6.nix
··· 16 17 stdenv.mkDerivation rec { 18 pname = "gupnp"; 19 - version = "1.6.4"; 20 21 outputs = [ "out" "dev" "devdoc" ]; 22 23 src = fetchurl { 24 url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 25 - sha256 = "sha256-1sPQNYOET6UqvgAwQxhgB/DIQUX+OwD6slmVvtqb5Vo="; 26 }; 27 28 depsBuildBuild = [
··· 16 17 stdenv.mkDerivation rec { 18 pname = "gupnp"; 19 + version = "1.6.5"; 20 21 outputs = [ "out" "dev" "devdoc" ]; 22 23 src = fetchurl { 24 url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 25 + hash = "sha256-Q33/lwFC6EBwh6iYVfcX4g0nydduBbTNUX32IcfYiM0="; 26 }; 27 28 depsBuildBuild = [
+9
pkgs/development/libraries/gupnp/default.nix
··· 35 # Bring .pc file in line with our patched pkg-config. 36 ./0001-pkg-config-Declare-header-dependencies-as-public.patch 37 38 # Fix build against libxml2 2.11 39 # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34 40 (fetchpatch2 { 41 url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch"; 42 hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY="; 43 })
··· 35 # Bring .pc file in line with our patched pkg-config. 36 ./0001-pkg-config-Declare-header-dependencies-as-public.patch 37 38 + # Unbreak build with Meson 1.2.0 39 + # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/33 40 + (fetchpatch2 { 41 + name = "meson-1.2-fix.patch"; 42 + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/85c0244cfbf933d3e90d50ab68394c68d86f9ed5.patch"; 43 + hash = "sha256-poDhkEgDTpgGnTbbZLPwx8Alf0h81vmzJyx3izWmDGw="; 44 + }) 45 + 46 # Fix build against libxml2 2.11 47 # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34 48 (fetchpatch2 { 49 + name = "libxml2-2.11-fix.patch"; 50 url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch"; 51 hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY="; 52 })