Commit Graph

32 Commits

Author SHA1 Message Date
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
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
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
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
Guillaume Bouchard
2021895c3f Bumblebee now only uses one opengl implementation
Thanks to the `overlay`, `nvidia-x11` is the same across all `nixpkgs`.
2018-07-10 00:50:33 +02:00
Guillaume Bouchard
df9d0ecc16 Add nixGLCommon 2018-06-30 13:10:59 +02:00
Guillaume Bouchard
21764c9926 Nixpkgs version can now be specified as the pkgs argument 2018-06-30 11:32:58 +02:00
Guillaume Bouchard
2b9e5fb6ed Remove version flag
Not really used
2018-06-30 11:32:24 +02:00
Guillaume Bouchard
69644dd5da Fix for bug #10
Recently, most packages which were previously depending on `mesa`
switched to `libGL`, which is supposed to find the host system opengl
library, as long as it is available in the library search path.
2018-05-19 21:52:27 +02:00
Guillaume Bouchard
d78549fef3 Create a wrapper for nvidia install
Hash of nvidia driver is not known because it depends on the driver version
(argument `nvidiaVersion`). However, since nix 2.0 and when using `useSandbox`,
`sha256 = null` is not allowed anymore.

The new wrapper script, `nvidiaInstall.py` uses `nix-prefetch-url` to compute
the hash and call `nix`.

This is a fix for #9
2018-05-19 21:37:45 +02:00
Joe Hermaszewski
624ea697ac Fix vulkan nvidia wrapper (make the wrapper executable) 2018-04-20 09:43:14 +02:00
Joe Hermaszewski
5df6048ead Factor out commonalities between NVIDIA wrappers 2018-04-07 16:04:24 +08:00
Joe Hermaszewski
2388c2ff41 Add nixVulkanNvidia 2018-04-07 15:48:26 +08:00
Joe Hermaszewski
ee5d1d4eee Make nixVulkanIntel more like the other derivations 2018-04-07 15:46:06 +08:00
Joe Hermaszewski
08873181af Add nixVulkanIntel wrapper 2018-04-07 15:40:43 +08:00
Guillaume Bouchard
1ddb413a69 Remove glVND dependency. Tentative fix for #3 2018-02-26 16:07:23 +01:00
Guillaume Bouchard
52149c5780 Nvidia with version 2018-02-19 16:30:03 +01:00
Guillaume Bouchard
335ce768c7 Nvidia libs only
- Avoid building (and fetching) linux kernel
2018-02-19 16:23:11 +01:00
Guillaume Bouchard
1046517dcd More robust solution for intel / nvidia / nvidia (bumblebee) 2018-02-17 22:53:49 +01:00
Guillaume Bouchard
3eaf867565 More robust dependency lookup 2017-09-16 14:28:57 +02:00
Guillaume Bouchard
c17063d377 First version 2017-09-16 13:52:15 +02:00