diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/jami.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
| download | guix-839bb4616f13171a23ad7937bf57d0a01d61d42a.tar guix-839bb4616f13171a23ad7937bf57d0a01d61d42a.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/jami.scm')
| -rw-r--r-- | gnu/packages/jami.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index cff8a6e4d6..4e8d36ca96 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -59,7 +59,6 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (gnu packages) - #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system qt) @@ -108,8 +107,8 @@ patches)))) (define-public pjproject-jami - (let ((commit "513a3f14c44b2c2652f9219ec20dea64b236b713") - (revision "1")) + (let ((commit "20e00fcdd16459444bae2bae9c0611b63cf87297") + (revision "2")) (package (inherit pjproject) (name "pjproject-jami") @@ -128,7 +127,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1vzfpiwhd96a9ibk398z922a60j18xd7mblsmi6355r7ccj2aw7p")))) + "1g8nkb5ln5y208k2hhmlcddv2dzf6plfrsvi4x8sa7iwgb4prgb8")))) (arguments (substitute-keyword-arguments (package-arguments pjproject) ((#:phases phases '%standard-phases) |