diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 15:59:30 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 15:59:30 -0400 |
| commit | 990a4822f1cb45c1470fe38cbf17fd7bb54d0088 (patch) | |
| tree | 1c1ff41c9264fe5af5ee0b8723d1e367e958c051 /gnu/packages/gstreamer.scm | |
| parent | 91db77c955cc7ef95dd8b535e40d6b4cf28669ec (diff) | |
| parent | 3c6e220d8100281074c414a43c1efe9a01b53771 (diff) | |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cran.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/icu4c.scm
gnu/packages/java.scm
gnu/packages/machine-learning.scm
gnu/packages/tex.scm
Diffstat (limited to 'gnu/packages/gstreamer.scm')
| -rw-r--r-- | gnu/packages/gstreamer.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index a1cf662e37..77b62264ff 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -823,7 +823,8 @@ model to base your own plug-in on, here it is.") xorg-server-for-tests)) (inputs (append - (if (target-x86?) (list mediasdk svt-hevc) '()) + (if (target-x86?) (list mediasdk) '()) + (if (target-x86-64?) (list svt-hevc) '()) (list bluez bzip2 cairo |