diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-17 10:55:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 10:55:30 +0100 |
| commit | 1b70a024817973750c2d97ca0b4b10abc8dd3f80 (patch) | |
| tree | e4d61feebb3b1173b5942014380eb88dbc3997c8 /pkgs | |
| parent | d3292f7192cd7e286fff5d354ef2887556df8f21 (diff) | |
| parent | d3d57b16d4d1fe14e420eaefcec6363939b171d1 (diff) | |
| download | nixlib-1b70a024817973750c2d97ca0b4b10abc8dd3f80.tar nixlib-1b70a024817973750c2d97ca0b4b10abc8dd3f80.tar.gz nixlib-1b70a024817973750c2d97ca0b4b10abc8dd3f80.tar.bz2 nixlib-1b70a024817973750c2d97ca0b4b10abc8dd3f80.tar.lz nixlib-1b70a024817973750c2d97ca0b4b10abc8dd3f80.tar.xz nixlib-1b70a024817973750c2d97ca0b4b10abc8dd3f80.tar.zst nixlib-1b70a024817973750c2d97ca0b4b10abc8dd3f80.zip | |
Merge pull request #114879 from Pacman99/calls-update
calls: 0.2.0 -> 0.3.1, callaudiod: 0.0.4 -> 0.1.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/callaudiod/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/calls/default.nix | 25 |
2 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index d742961939f6..6529cd860c8a 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.0.4"; + version = "0.1.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj"; + sha256 = "087589z45xvldn2m1g79y0xbwzylwkjmfk83s5xjixyq0wqmfppd"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index fcd27eceaa84..8937404e91d3 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , meson , ninja -, cmake , pkg-config , libhandy , modemmanager @@ -13,35 +12,46 @@ , feedbackd , callaudiod , evolution-data-server +, glib , folks , desktop-file-utils +, appstream-glib , libpeas , dbus , vala , wrapGAppsHook , xvfb_run +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gobject-introspection }: stdenv.mkDerivation rec { pname = "calls"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l"; + sha256 = "0igap5ynq269xqaky6fqhdg2dpsvxa008z953ywa4s5b5g5dk3dd"; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils + appstream-glib vala - cmake wrapGAppsHook + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ @@ -62,10 +72,10 @@ stdenv.mkDerivation rec { xvfb_run ]; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + mesonFlags = [ - # docs fail to build - # https://source.puri.sm/Librem5/calls/issues/99 - "-Dgtk_doc=false" + "-Dgtk_doc=true" ]; doCheck = true; @@ -73,6 +83,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck NO_AT_BRIDGE=1 \ + XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test --print-errorlogs |