diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
commit | e08902d3cbb307e1523485becbbdaf9aed56ac4a (patch) | |
tree | ca79454c4146f37c0e0f4d354d434816928812ed /gnu/packages/gl.scm | |
parent | 1714edc3d4e8d6da1b0cdef300ae882d0885f182 (diff) | |
parent | f58702465d0b2daab1775d29439b73b4486a108a (diff) | |
download | guix-e08902d3cbb307e1523485becbbdaf9aed56ac4a.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gl.scm')
-rw-r--r-- | gnu/packages/gl.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index fe895d3840..06e7bb5ae9 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -350,7 +350,8 @@ also known as DXTn or DXTC) for Mesa.") (substitute* "src/intel/genxml/gen_pack_header.py" (("/usr/bin/env python2") (which "python"))) #t)) - ,@(if (string-prefix? "i686" (%current-system)) + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) ;; Disable new test from Mesa 19 that fails on i686. Upstream ;; report: <https://bugs.freedesktop.org/show_bug.cgi?id=110612>. `((add-after 'unpack 'disable-failing-test |