suzanne.soy/nixGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80 Commits 6 Branches 0 Tags 106 KiB
patch-1
Commit Graph

80 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume Bouchard
76e4820d8a
Update default.nix 2020-10-05 13:35:30 +02:00
Suzanne Soy
8d894a5682 Typos 2020-10-05 00:44:04 +01:00
Suzanne Soy
0c97096826
Typos 2020-10-05 00:42:20 +01:00
Guillaume Bouchard
210c6a8a54
Merge pull request #59 from tudurom/master 
Use runtimeShell instead of #!/usr/bin/env sh
 2020-07-27 11:12:54 +02:00
Guillaume Bouchard
6fab1faca5
Merge pull request #57 from yilinwei/patch-1 
Update README.md
 2020-07-24 22:56:58 +02:00
Yilin Wei
ab5c39d32e
Update README.md 
vulkan-loader doesn't have vulkaninfo
 2020-07-19 18:30:37 +01:00
Guillaume Bouchard
e7039bfb2c
Merge pull request #56 from guibou/nvidia_main_libs_only 
Do not build nvidia linux module for nixGLNvidia
 2020-07-02 17:23:34 +02:00
Guillaume Bouchard
410cd5b482 Do not build nvidia linux module for nixGLNvidia 
Partial fix for #55.

This commit does not build the nvidia kernel module for `nixGLNvidia`
using `libsOnly = true`.

This cannot be applied to `nixGLNvidiaBumblebee` which needs some stuffs
in `nvidia_x11.bin` which only appears if it is built with `libsOnly =
false`.
 2020-06-10 17:23:31 +02:00
Tudor Roman
339c6c5795
use runtimeShell instead of #!/usr/bin/env sh 2020-06-08 14:05:27 +03:00
Guillaume Bouchard
5f330c2185
Merge pull request #45 from lopsided98/nvidia-local-build 
Test.hs: make sure to build the impure NVIDIA version derivation locally
 2020-04-30 18:55:59 +02:00
Ben Wolsieffer
7bb080c0e5 Test.hs: make sure to build the impure NVIDIA version derivation locally 2020-04-29 23:45:54 -04:00
Guillaume Bouchard
76196e5da3
Merge pull request #40 from zimbatm/nvidia-version-file 
Nvidia version file
 2020-04-28 17:12:48 +02:00
zimbatm
4c09910428
handle nixGLDefault with nvidiaVersionFile 2020-04-28 16:57:16 +02:00
Guillaume Bouchard
b5660a81bd
Merge pull request #42 from zimbatm/readme 
README: document nixGLDefault
 2020-04-28 16:39:07 +02:00
zimbatm
4fb0203a54
README: document nixGLDefault 2020-04-28 16:02:50 +02:00
zimbatm
7aa1cce7c6
allow to pass a nvidiaVersionFile 
This allows to better control which driver is being loaded.
 2020-04-28 15:27:24 +02:00
Guillaume Bouchard
7f934a88ce
Merge pull request #41 from zimbatm/github-actions 
add Github Action to run the tests
 2020-04-28 13:55:15 +02:00
Guillaume Bouchard
3df3a471ae
Merge pull request #39 from zimbatm/test-fixes 
Test.hs: fixes the default.nix invocation
 2020-04-28 13:54:10 +02:00
zimbatm
06f91bf67e
add Github Action to run the tests 
CircleCI doesn't seem to be running on the repository. This also makes
it easy for people who fork the repo to run the CI since it is enabled
by default on all the repositories.
 2020-04-28 13:07:15 +02:00
zimbatm
9348b49674
Test.hs: fixes the default.nix invocation 
This has been broken by me in d0379a8673
 2020-04-28 13:05:53 +02:00
zimbatm
0564a32785
Test.hs: inherit stderr from the parent 
This allows to show the progress while building the tests
 2020-04-28 12:57:18 +02:00
Guillaume Bouchard
e2cc0101af
Merge pull request #38 from zimbatm/pass-nixpkgs 
break: change how nixpkgs is passed to the project
 2020-04-28 11:44:59 +02:00
zimbatm
d0379a8673
break: change how nixpkgs is passed to the project 
Evaluating nixpkgs is quite expensive and should be done only once if
possible. This allows to pass a correctly-configured instance of nixpkgs
(with allowUnfree = true).

Unfortunately this requires to break the current interface.
 2020-04-28 11:37:39 +02:00
Guillaume Bouchard
3db9b5d12a Update test bench for vulkan 
- Just check for `driverName` in the output string
 2020-04-28 11:04:08 +02:00
Guillaume Bouchard
ace3193d44 Mesa Vulkan: set icd files for all drivers 2020-04-28 11:04:08 +02:00
Guillaume Bouchard
17c1ec63b9 Ignore stderr on tests 2020-04-27 18:01:41 +02:00
Guillaume Bouchard
201b4facf5 A few test cleanup 
- disable test for vulkan bumblebee, there is no implementation
 2020-04-27 18:01:41 +02:00
Guillaume Bouchard
122026d20c Add nixGLDefault 2020-04-27 18:01:41 +02:00
Guillaume Bouchard
701dfc8c6e Add a bunch of tests for Vulkan 2020-04-27 18:01:41 +02:00
Guillaume Bouchard
a02035314b Add a few VK_ICD_FILENAMES 
This is a tentative fix for #28.

I cannot test nvidia, however I confirm it works for Intel (Mesa) cards.
 2020-04-27 18:01:41 +02:00
Guillaume Bouchard
d05a776200 Tests: 
- Add failure test (to test on nixos, we ensure that it fails with
another libc implementation).
 2020-04-27 18:01:41 +02:00
Guillaume Bouchard
7009c94a93 Move to nixGL.nix 2020-04-27 18:01:41 +02:00
Guillaume Bouchard
ae5bc98bb7 Remove the need for an overlay 
nvidia_x11 was overrode in an overlay. It is no longer the case and the
override is now explicit.

This will allows the creation of a `nixGL.nix` file callable with
`callPackage`. This change is a preliminary work for inclusion in
`nixpkgs`, as requested in #16.

It will also highly improve the use on nixGL in other project because
user won't have to pass a non initialized `nixpkgs`.
 2020-04-27 18:01:41 +02:00
Guillaume Bouchard
237b47397f Add a manual test suite 2020-04-26 23:55:24 +02:00
Guillaume Bouchard
66c92824ab Fix 32 bits for nvidia and nvidia bumblebee 
I was able to test for nvidia bumblebee.
 2020-04-26 23:55:24 +02:00
Guillaume Bouchard
d5c0d28968 Nvidia: automatic detection of the version 
The automatic detection uses the /proc interface proposed by the Nvidia
kernel module.

Having autodetection inside nix, I also changed the way the driver is
fetched, so everything is done inside nix. So no more `nvidiaInstall`
wrapper script.

I updated the `README` accordingly.
 2020-04-26 19:51:32 +02:00
Guillaume Bouchard
1ba64e0199 Add support for 32bit in nixGLIntel 
This closes #30. OpenGL support for 32bit is unconditionnally added to
nixGLIntel.

- Nvidia with bumblebee seems to work out of the box. I don't know why.
- I don't have the hardware to test vulkan.
- I don't have the hardware to test pure nvidia.
 2020-04-26 16:35:07 +02:00
Guillaume Bouchard
3ef7bffcae Use makeLibraryPath when appropriate 2020-04-26 16:35:07 +02:00
Guillaume Bouchard
33282d65db Add simple CI. At least it checks that all targets build 2020-04-26 15:11:58 +02:00
Guillaume Bouchard
d67944d5ae Add a missing separator in the Nvidia wrapper 2020-04-26 15:11:58 +02:00
Joe Hermaszewski
66d99ddb67 Correct vulkan/gl wrapper information in readme 2020-03-22 12:18:48 +01:00
Guillaume Bouchard
f3b50205ef Restore the shellcheck phase and fix it 2020-03-03 20:57:43 +01:00
Guillaume Bouchard
ea7c1d70fc Factorize the writeTextFile common parts 2020-03-03 20:57:43 +01:00
Guillaume Bouchard
13352162de Rewrite all rules using pkgs.writeTextFile 
- It is more compact and easier to read
- Escaping is correctly done

This fixs #21 and #22
 2020-03-03 20:57:43 +01:00
Joe Hermaszewski
5ba3174763 Add Vulkan validation layers to Nvidia wrapper 2020-02-23 16:52:47 +01:00
Guillaume Bouchard
04a6b0833f Preserve system LD_LIBRARY_PATH 2018-09-27 16:07:00 +02:00
Guillaume Bouchard
a02970d696 Add documentation for legacy driver now that we switch to GLVND 2018-07-10 03:35:54 +02:00
Guillaume Bouchard
fa08b64b31 Use GLVND 
This fixes missing symbols
 2018-07-10 03:35:54 +02:00
Guillaume Bouchard
9e33a6ecb1 Set --ldrun path for bumblebee. 
Instead, optirun looks inside `/usr/lib`.
 2018-07-10 02:16:58 +02:00
Guillaume Bouchard
4088ce159e Allow unfree by default 2018-07-10 02:16:42 +02:00