diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/dleyna-connector-dbus | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/dleyna-connector-dbus')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix index 1c0d360e4f45..a6983decf33f 100644 --- a/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -4,6 +4,7 @@ , ninja , pkg-config , fetchFromGitHub +, fetchpatch , dleyna-core , glib }: @@ -19,6 +20,17 @@ stdenv.mkDerivation rec { sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA="; }; + patches = [ + # Fix build with meson 1.2. We use the gentoo patch intead of the + # usptream one because the latter only applies on the libsoup_3 based + # merged dLeyna project. + # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 + (fetchpatch { + url = "https://github.com/gentoo/gentoo/raw/4a0982b49a1d94aa785b05d9b7d256c26c499910/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch"; + sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; + }) + ]; + nativeBuildInputs = [ meson ninja |