diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2021-03-24 15:28:33 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2021-03-24 20:50:44 +0200 |
commit | 2aab587f842908a886e3bd08b028885dddd650e0 (patch) | |
tree | 87c0723a9ae2c69ab6920d90b6e87ad8510492fe /gnu/packages/jami.scm | |
parent | 5664bcdcb0e4c10dfe48dd5e4730fc3c746a21e2 (diff) | |
parent | 65c46e79e0495fe4d32f6f2725d7233fff10fd70 (diff) | |
download | guix-2aab587f842908a886e3bd08b028885dddd650e0.tar.gz guix-2aab587f842908a886e3bd08b028885dddd650e0.zip |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/jami.scm')
-rw-r--r-- | gnu/packages/jami.scm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index c47293b5c1..3773c1ab0a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -365,8 +365,7 @@ of Jami." '()))) (define-public ffmpeg-jami - (package - (inherit ffmpeg) + (package/inherit ffmpeg (name "ffmpeg-jami") (native-inputs `(("sfl-patches" ,%sfl-patches) |