diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-28 09:28:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-28 09:28:19 +0100 |
commit | 3dec0793b2bcbe64f6f45f729ad483cb15b1d591 (patch) | |
tree | 9a886acc97d8594fbbaafda9df635be97b223072 /pkgs | |
parent | 7c64ac53110776bcbb70ebe7b0ead2fc36a94aec (diff) | |
parent | 24552931d8d5dbd1b8bfb0e330dd2f46bdf90e67 (diff) |
Merge pull request #107681 from Pacman99/calls-update
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/callaudiod/default.nix | 43 | ||||
-rw-r--r-- | pkgs/applications/misc/feedbackd/default.nix | 52 | ||||
-rw-r--r-- | pkgs/applications/networking/calls/default.nix | 19 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 112 insertions, 6 deletions
diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix new file mode 100644 index 000000000000..d742961939f6 --- /dev/null +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, glib +, alsaLib +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "callaudiod"; + version = "0.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "mobian1"; + repo = pname; + rev = version; + sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + alsaLib + libpulseaudio + glib + ]; + + meta = with lib; { + description = "Daemon for dealing with audio routing during phone calls"; + homepage = "https://gitlab.com/mobian1/callaudiod"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pacman99 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix new file mode 100644 index 000000000000..34119c2006d4 --- /dev/null +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, wrapGAppsHook +, glib +, gsound +, libgudev +, json-glib +, vala +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "feedbackd-unstable"; + version = "2021-01-25"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = "feedbackd"; + rev = "v0.0.0+git${builtins.replaceStrings ["-"] [""] version}"; + sha256 = "184ag10sfzrka533inv6f38x6z769kq5jj56vdkcm65j5h786w5v"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + vala + gobject-introspection + ]; + + buildInputs = [ + glib + gsound + libgudev + json-glib + ]; + + meta = with lib; { + description = "A daemon to provide haptic (and later more) feedback on events"; + homepage = "https://source.puri.sm/Librem5/feedbackd"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pacman99 ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index e6d4845761a5..01797397f4ef 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -1,13 +1,17 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , meson , ninja +, cmake , pkg-config -, libhandy_0 +, libhandy , modemmanager , gtk3 , gom , gsound +, feedbackd +, callaudiod , evolution-data-server , folks , desktop-file-utils @@ -22,14 +26,14 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; - repo = "calls"; + repo = pname; rev = "v${version}"; - sha256 = "1wqkczl1fn4d2py00fsb6kh05avmc7c49gi49j3592fqsvi87j18"; + sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l"; }; nativeBuildInputs = [ @@ -38,16 +42,19 @@ stdenv.mkDerivation rec { pkg-config desktop-file-utils vala + cmake wrapGAppsHook ]; buildInputs = [ modemmanager - libhandy_0 + libhandy evolution-data-server folks gom gsound + feedbackd + callaudiod gtk3 libpeas ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ef2105feea5..f9691e579dd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1111,6 +1111,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + callaudiod = callPackage ../applications/audio/callaudiod { }; + calls = callPackage ../applications/networking/calls { }; inherit (nodePackages) castnow; @@ -21787,6 +21789,8 @@ in fdr = libsForQt5.callPackage ../applications/science/programming/fdr { }; + feedbackd = callPackage ../applications/misc/feedbackd { }; + fehlstart = callPackage ../applications/misc/fehlstart { }; fetchmail = callPackage ../applications/misc/fetchmail { }; |