Merge pull request #114879 from Pacman99/calls-update
calls: 0.2.0 -> 0.3.1, callaudiod: 0.0.4 -> 0.1.0
This commit is contained in:
commit
1b70a02481
@ -11,14 +11,14 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "callaudiod";
|
pname = "callaudiod";
|
||||||
version = "0.0.4";
|
version = "0.1.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.com";
|
domain = "gitlab.com";
|
||||||
owner = "mobian1";
|
owner = "mobian1";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj";
|
sha256 = "087589z45xvldn2m1g79y0xbwzylwkjmfk83s5xjixyq0wqmfppd";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, cmake
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, libhandy
|
, libhandy
|
||||||
, modemmanager
|
, modemmanager
|
||||||
@ -13,35 +12,46 @@
|
|||||||
, feedbackd
|
, feedbackd
|
||||||
, callaudiod
|
, callaudiod
|
||||||
, evolution-data-server
|
, evolution-data-server
|
||||||
|
, glib
|
||||||
, folks
|
, folks
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
|
, appstream-glib
|
||||||
, libpeas
|
, libpeas
|
||||||
, dbus
|
, dbus
|
||||||
, vala
|
, vala
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, xvfb_run
|
, xvfb_run
|
||||||
|
, gtk-doc
|
||||||
|
, docbook-xsl-nons
|
||||||
|
, docbook_xml_dtd_43
|
||||||
|
, gobject-introspection
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "calls";
|
pname = "calls";
|
||||||
version = "0.2.0";
|
version = "0.3.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "source.puri.sm";
|
domain = "source.puri.sm";
|
||||||
owner = "Librem5";
|
owner = "Librem5";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l";
|
sha256 = "0igap5ynq269xqaky6fqhdg2dpsvxa008z953ywa4s5b5g5dk3dd";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
outputs = [ "out" "devdoc" ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
|
appstream-glib
|
||||||
vala
|
vala
|
||||||
cmake
|
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
|
gtk-doc
|
||||||
|
docbook-xsl-nons
|
||||||
|
docbook_xml_dtd_43
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -62,10 +72,10 @@ stdenv.mkDerivation rec {
|
|||||||
xvfb_run
|
xvfb_run
|
||||||
];
|
];
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
# docs fail to build
|
"-Dgtk_doc=true"
|
||||||
# https://source.puri.sm/Librem5/calls/issues/99
|
|
||||||
"-Dgtk_doc=false"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
@ -73,6 +83,7 @@ stdenv.mkDerivation rec {
|
|||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
runHook preCheck
|
runHook preCheck
|
||||||
NO_AT_BRIDGE=1 \
|
NO_AT_BRIDGE=1 \
|
||||||
|
XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \
|
||||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||||
meson test --print-errorlogs
|
meson test --print-errorlogs
|
||||||
|
Loading…
x
Reference in New Issue
Block a user