packaging: Fix deb-pack package.

The with-libjami/latest rewriting procedure was not applied to the
customized jami package, hence it was using libjami at its current
version in GNU Guix and failing to build.

* extras/packaging/gnu-linux/guix/guix-pack-manifest.scm
(with-latest-sources): Apply patch.
(libjami/latest): Disable test suite.
(jami-with-certs): Re-introduce -DLIBJAMI_INCLUDE_DIR configure flag.
(jami-with-certs/latest): Apply to with-libjami/latest.

Change-Id: I6266fa691dc8995300afb15bdbc9ce1640ab4d1d

extras/packaging/gnu-linux/guix/guix-pack-manifest.scm

@@ -18,9 +18,9 @@
 ;;; This GNU Guix manifest is used along the Makefile to build the
 ;;; latest Jami as a Guix pack.
 
-(use-modules (gnu packages certs)
+(use-modules (gnu packages)
+             (gnu packages certs)
              (gnu packages jami)
-             (gnu packages python)
              (guix base32)
              (guix gexp)
              (guix packages)
@@ -28,14 +28,14 @@
              (guix store)
              (guix utils))
 
-;;; XXX: Below is a rather strenuous way to specify something that
-;;; would have been nicer if it could have been specified via:
+;;; Rather than using something like in the Makefile:
 ;;;
 ;;; --with-source=libjami=$(RELEASE_TARBALL_FILENAME) \
-;;; --with-source=jami=$(RELEASE_TARBALL_FILENAME) in the Makefile.
+;;; --with-source=jami=$(RELEASE_TARBALL_FILENAME)
 ;;;
-;;; The above doesn't currently rewrite the dependency graph
-;;; recursively, hence why it is not sufficient.
+;;; the transformations must be made in this manifest file, because
+;;; packages from manifest are not affected by input rewriting
+;;; options, by design (see: https://issues.guix.gnu.org/61676).
 
 (define %release-version (getenv "RELEASE_VERSION"))
 
@@ -63,12 +63,30 @@
     (uri %release-file-name)
     (sha256 %release-file-hash)))
 
+;;; 'with-source' cannot currently be combined with 'with-patch' (see:
+;;; https://issues.guix.gnu.org/61684).
 (define (with-latest-sources name)
   (options->transformation
    `((with-source . ,(format #f "~a@~a=~a" name
-                             %release-version %release-file-name)))))
+                             %release-version %release-file-name))
+     ;; XXX: This is not effective, due to the above bug.
+     ,@(if (string=? name "libjami")
+           `((with-patch . ,(string-append
+                             name "="
+                             (search-patch
+                              "jami-disable-integration-tests.patch"))))
+           '()))))
 
-(define libjami/latest ((with-latest-sources "libjami") libjami))
+(define libjami/latest
+  ((with-latest-sources "libjami")
+   (package
+     (inherit libjami)
+     ;; FIXME: Disable test suite until #61684 above is fixed or the
+     ;; 'jami-disable-integration-tests.patch' merged (also see:
+     ;; https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/824).
+     (arguments (substitute-keyword-arguments (package-arguments libjami)
+                  ((#:tests? _ #t)
+                   #f))))))
 
 (define with-libjami/latest
   (package-input-rewriting `((,libjami . ,libjami/latest))))
@@ -82,6 +100,13 @@
               (append nss-certs)))
     (arguments
      (substitute-keyword-arguments (package-arguments jami)
+       ;; This is necessary due to the missing
+       ;; jami-libjami-headers-search.patch patch.
+       ((#:configure-flags flags '())
+        #~(cons (string-append "-DLIBJAMI_INCLUDE_DIR="
+                               #$(this-package-input "libjami")
+                               "/include/jami")
+                #$flags))
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             (add-after 'qt-wrap 'wrap-ssl-cert-dir
@@ -93,6 +118,6 @@
                            exec-line)))))))))))
 
 (define jami-with-certs/latest
-  ((with-latest-sources "jami") jami-with-certs))
+  (with-libjami/latest ((with-latest-sources "jami") jami-with-certs)))
 
 (packages->manifest (list jami-with-certs/latest))