mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
telepathy-glib: fix gcc14 build (#353945)
This commit is contained in:
commit
89149f822e
@ -1,21 +1,26 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, dbus-glib
|
||||
, glib
|
||||
, python3
|
||||
, pkg-config
|
||||
, libxslt
|
||||
, gobject-introspection
|
||||
, vala
|
||||
, glibcLocales
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
dbus-glib,
|
||||
glib,
|
||||
python3,
|
||||
pkg-config,
|
||||
libxslt,
|
||||
gobject-introspection,
|
||||
vala,
|
||||
glibcLocales,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-glib";
|
||||
version = "0.24.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz";
|
||||
@ -52,9 +57,22 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Upstream unreleased patch for gcc14 error
|
||||
(fetchpatch {
|
||||
name = "fix-incompatible-pointer-types.patch";
|
||||
url = "https://github.com/TelepathyIM/telepathy-glib/commit/72412c944b771f3214ddc40fa9dea82cea3a5651.patch";
|
||||
hash = "sha256-NXQel0eS7zK6FRbJcPsPXCQxos0xT8EN102vX94M5Vo=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://telepathy.freedesktop.org";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ bsd2 bsd3 lgpl21Plus ];
|
||||
license = with licenses; [
|
||||
bsd2
|
||||
bsd3
|
||||
lgpl21Plus
|
||||
];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user