diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-11 23:30:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-11 23:30:32 +0200 |
| commit | 9b043df7403a10b35b93d133aac796fd277a7339 (patch) | |
| tree | f712922d9348ececc0d84e360ac653df3b8d2473 /gnu/packages/video.scm | |
| parent | d79ec4fd343bc2a72652aa3a4b4ae14bd8df88ac (diff) | |
| parent | 648ae62112f62bc2106fb36d45c83fda787d3bed (diff) | |
| download | guix-9b043df7403a10b35b93d133aac796fd277a7339.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4ce2c3098b..16136b7662 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -625,7 +625,11 @@ available.") (delete-file-recursively "source/compat/getopt") #t)))) (build-system cmake-build-system) - (native-inputs `(("nasm" ,nasm))) + (native-inputs + ;; XXX: ASM optimization fails on i686-linux, see <https://bugs.gnu.org/41768>. + (if (string-prefix? "i686" (%current-system)) + '() + `(("nasm" ,nasm)))) (arguments `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built #:configure-flags |