Enable GFX in xf86-video-vmware #49115
Merged
+3
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
10.rebuild-darwin: 0
|
Can you change the commit message to "xorg.xf86videovmware: Fix for GFX support" or so? If you need a backport to 18.09 feel free to open a PR for that (usually people put [18.09] in the title to indicate it being a backport) |
Fix the mesa dependency for `xorg.xf86videovmware`. Add `llvm_6` because `mesa_noglu` has a runtime dependency on clang (see TODO in `development/libraries/mesa`).
7 tasks
|
Thanks for your feedback. I changed the commit message and created an addional PR for the backport. |
|
Is this still necessary? I see LLVM 9 in the output of $ ldd result/lib/xorg/modules/drivers/vmware_drv.so
linux-vdso.so.1 (0x00007ffc67962000)
libdrm.so.2 => /nix/store/c4rmpy6g45s2kyvmh1iw7n956zw57jcg-libdrm-2.4.100/lib/libdrm.so.2 (0x00007fbf0b3ac000)
libxatracker.so.2 => /nix/store/f1cr7nw3bhhsp8kkmz2k5kp5ds92si43-mesa-19.2.7-drivers/lib/libxatracker.so.2 (0x00007fbf0ae0d000)
libudev.so.1 => /nix/store/m7s79nz19n92s0xb3y2h89rs992nmxgy-systemd-243.3-lib/lib/libudev.so.1 (0x00007fbf0addc000)
libc.so.6 => /nix/store/xhpwab5kavygbr1fswawmdyqvmn3wa4i-glibc-2.27/lib/libc.so.6 (0x00007fbf0ac26000)
libm.so.6 => /nix/store/xhpwab5kavygbr1fswawmdyqvmn3wa4i-glibc-2.27/lib/libm.so.6 (0x00007fbf0aa90000)
libdl.so.2 => /nix/store/xhpwab5kavygbr1fswawmdyqvmn3wa4i-glibc-2.27/lib/libdl.so.2 (0x00007fbf0aa89000)
libexpat.so.1 => /nix/store/l1ym5fsdavwrhcyvaf42kdgclnsngdan-expat-2.2.8/lib/libexpat.so.1 (0x00007fbf0aa4c000)
libdrm_nouveau.so.2 => /nix/store/c4rmpy6g45s2kyvmh1iw7n956zw57jcg-libdrm-2.4.100/lib/libdrm_nouveau.so.2 (0x00007fbf0aa41000)
libz.so.1 => /nix/store/ylpi31dwsgm9c9rndp0j5b4na749d97z-zlib-1.2.11/lib/libz.so.1 (0x00007fbf0aa22000)
libLLVM-9.so => /nix/store/hzk4k1lpp5qcsfm5y940sgjx60v0mgf2-llvm-9.0.0-lib/lib/libLLVM-9.so (0x00007fbf05cf1000)
libstdc++.so.6 => /nix/store/qj8adhbg37824sa1fijjfm140q3a35m7-gcc-8.3.0-lib/lib/libstdc++.so.6 (0x00007fbf05b64000)
libgcc_s.so.1 => /nix/store/xhpwab5kavygbr1fswawmdyqvmn3wa4i-glibc-2.27/lib/libgcc_s.so.1 (0x00007fbf0594e000)
libpthread.so.0 => /nix/store/xhpwab5kavygbr1fswawmdyqvmn3wa4i-glibc-2.27/lib/libpthread.so.0 (0x00007fbf0592d000)
librt.so.1 => /nix/store/xhpwab5kavygbr1fswawmdyqvmn3wa4i-glibc-2.27/lib/librt.so.1 (0x00007fbf05923000)
/nix/store/xhpwab5kavygbr1fswawmdyqvmn3wa4i-glibc-2.27/lib64/ld-linux-x86-64.so.2 (0x00007fbf0b3f1000)
libffi.so.7 => /nix/store/zdl0hjgkyiclzzgdi0q4z2zm78zdvnif-libffi-3.3/lib/libffi.so.7 (0x00007fbf05914000)
libncursesw.so.6 => /nix/store/3cz3xgnghkpy41ab9hcj7011sqbrpg4n-ncurses-6.1-20190112/lib/libncursesw.so.6 (0x00007fbf058a2000)
libxml2.so.2 => /nix/store/gz9dlzm6r0shjqn5iclrv10lmwbq3cfv-libxml2-2.9.10/lib/libxml2.so.2 (0x00007fbf0573c000) |
Janik-Haag
added
the
12. first-time contribution
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix the mesa dependency for
xorg.xf86videovmware. Addllvm_6becausemesa_nogluhas a runtime dependency on clang (see TODO indevelopment/libraries/mesa).Motivation for this change
GFX support in the xf86-video-vmware driver broke in NixOS 18.09 because of the changes to the mesa package (the package was split).
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)