diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/gupnp | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gupnp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gupnp/1.6.nix | 14 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gupnp/default.nix | 8 |
2 files changed, 10 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix b/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix index 2b3cd2566b5b..da830a6366c9 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , meson , ninja @@ -17,24 +16,15 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.3"; + version = "1.6.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-T09Biwe4EWTfH3q2EuKOTAFsLQhbik85+XlF+LFe4kg="; + sha256 = "sha256-1sPQNYOET6UqvgAwQxhgB/DIQUX+OwD6slmVvtqb5Vo="; }; - patches = [ - (fetchpatch { - # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/32 - name = "gi-docgen-as-native-dep.patch"; - url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/11d4a33cff1f5d8b8ad4b80c4506246a9e0dff8f.diff"; - hash = "sha256-+p4vzUG2v+7mxtQ5AUcEI7SW0cDX6XlzqlyegF+I1Go="; - }) - ]; - depsBuildBuild = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/nixpkgs/pkgs/development/libraries/gupnp/default.nix index bebf109d2778..4bff529a5156 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -33,6 +34,13 @@ stdenv.mkDerivation rec { patches = [ # Bring .pc file in line with our patched pkg-config. ./0001-pkg-config-Declare-header-dependencies-as-public.patch + + # Fix build against libxml2 2.11 + # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch"; + hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY="; + }) ]; depsBuildBuild = [ |