diff options
author | 宋文武 <iyzsong@gmail.com> | 2015-04-08 16:04:37 +0800 |
---|---|---|
committer | 宋文武 <iyzsong@gmail.com> | 2015-04-08 16:04:37 +0800 |
commit | cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc (patch) | |
tree | b4ce7938c855781af2e0a1e68b3588f96de7e7e1 /gnu/packages/xorg.scm | |
parent | 4ae7559fd62c03a800b010c228639f18b9f58006 (diff) | |
parent | 068a53c36dec5ace42cc3ea89060d9a485592f08 (diff) | |
download | guix-patches-cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc.tar guix-patches-cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r-- | gnu/packages/xorg.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cfb4cc1643..998f0803fc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2932,7 +2932,8 @@ graphics cards.") (sha256 (base32 "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy")) - (patches (list (search-patch "xf86-video-sis-update-api.patch"))))) + (patches (list (search-patch "xf86-video-sis-update-api.patch") + (search-patch "xf86-video-sis-fix-exa-crash.patch"))))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86dgaproto" ,xf86dgaproto) |