diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-08-02 16:06:04 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-08-02 17:23:30 -0400 |
| commit | 10f554700c417b84c22c56fdd007567a52c45d75 (patch) | |
| tree | 7a29433e67959982feecfd6fba05ad26a632a3a7 /gnu/local.mk | |
| parent | 0ae0d8b4ce006797967b602ab2b2e61c24594f2f (diff) | |
| download | guix-patches-10f554700c417b84c22c56fdd007567a52c45d75.tar guix-patches-10f554700c417b84c22c56fdd007567a52c45d75.tar.gz | |
Reinstate "services: Add a service for Jami."
This reverts commit 4673f817938d9d2b1b40a072ab2e0c44a32ccc97, which reverted
commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b with the fix detailed below.
Thanks to Christopher Baines for reporting the failure and proposing a fix.
* guix/self.scm (compiled-guix) [*system-test-modules*]: Add the test data
files via the 'extra-files' argument.
* gnu/local.mk (dist_patch_DATA): Move the tests/data/jami-dummy-account.dat
file to...
* gnu/local.mk (MODULES_NOT_COMPILED): ... here.
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 9e8f2d702d..e8494806fd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -685,6 +685,7 @@ GNU_SYSTEM_MODULES = \ %D%/build/chromium-extension.scm \ %D%/build/cross-toolchain.scm \ %D%/build/image.scm \ + %D%/build/jami-service.scm \ %D%/build/file-systems.scm \ %D%/build/hurd-boot.scm \ %D%/build/install.scm \ @@ -722,6 +723,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/security-token.scm \ %D%/tests/singularity.scm \ %D%/tests/ssh.scm \ + %D%/tests/telephony.scm \ %D%/tests/version-control.scm \ %D%/tests/virtualization.scm \ %D%/tests/web.scm @@ -787,7 +789,8 @@ dist_installer_DATA = \ MODULES_NOT_COMPILED += \ %D%/build/locale.scm \ %D%/build/shepherd.scm \ - %D%/build/svg.scm + %D%/build/svg.scm \ + %D%/tests/data/jami-dummy-account.dat patchdir = $(guilemoduledir)/%D%/packages/patches dist_patch_DATA = \ |