git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #114879 from Pacman99/calls-update

calls: 0.2.0 -> 0.3.1, callaudiod: 0.0.4 -> 0.1.0

commit1b70a024817973750c2d97ca0b4b10abc8dd3f80 authorJan Tojnar <jtojnar@gmail.com> dateWed 17 Mar 2021, 10:55 (6 years ago) parentd3292f7d3d57b1
2 files changed+20−9
pkgs/applications/audio/callaudiod/default.nix+2−2 pkgs/applications/networking/calls/default.nix+18−7
pkgs/applications/audio/callaudiod/default.nix+2−2
@@ -11,14 +11,14 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "callaudiod";
14− version = "0.0.4";
14+ version = "0.1.0";
1515
1616 src = fetchFromGitLab {
1717 domain = "gitlab.com";
1818 owner = "mobian1";
1919 repo = pname;
2020 rev = version;
21− sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj";
21+ sha256 = "087589z45xvldn2m1g79y0xbwzylwkjmfk83s5xjixyq0wqmfppd";
2222 };
2323
2424 nativeBuildInputs = [
pkgs/applications/networking/calls/default.nix+18−7
@@ -3,7 +3,6 @@
33, fetchFromGitLab
44, meson
55, ninja
6−, cmake
76, pkg-config
87, libhandy
98, modemmanager
@@ -13,35 +12,46 @@
1312, feedbackd
1413, callaudiod
1514, evolution-data-server
15+, glib
1616, folks
1717, desktop-file-utils
18+, appstream-glib
1819, libpeas
1920, dbus
2021, vala
2122, wrapGAppsHook
2223, xvfb_run
24+, gtk-doc
25+, docbook-xsl-nons
26+, docbook_xml_dtd_43
27+, gobject-introspection
2328}:
2429
2530stdenv.mkDerivation rec {
2631 pname = "calls";
27− version = "0.2.0";
32+ version = "0.3.1";
2833
2934 src = fetchFromGitLab {
3035 domain = "source.puri.sm";
3136 owner = "Librem5";
3237 repo = pname;
3338 rev = "v${version}";
34− sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l";
39+ sha256 = "0igap5ynq269xqaky6fqhdg2dpsvxa008z953ywa4s5b5g5dk3dd";
3540 };
3641
42+ outputs = [ "out" "devdoc" ];
43+
3744 nativeBuildInputs = [
3845 meson
3946 ninja
4047 pkg-config
4148 desktop-file-utils
49+ appstream-glib
4250 vala
43− cmake
4451 wrapGAppsHook
52+ gtk-doc
53+ docbook-xsl-nons
54+ docbook_xml_dtd_43
4555 ];
4656
4757 buildInputs = [
@@ -62,10 +72,10 @@ stdenv.mkDerivation rec {
6272 xvfb_run
6373 ];
6474
75+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
76+
6577 mesonFlags = [
66− # docs fail to build
67− # https://source.puri.sm/Librem5/calls/issues/99
68− "-Dgtk_doc=false"
78+ "-Dgtk_doc=true"
6979 ];
7080
7181 doCheck = true;
@@ -73,6 +83,7 @@ stdenv.mkDerivation rec {
7383 checkPhase = ''
7484 runHook preCheck
7585 NO_AT_BRIDGE=1 \
86+ XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \
7687 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
7788 --config-file=${dbus.daemon}/share/dbus-1/session.conf \
7889 meson test --print-errorlogs