suzanne.soy/nixGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from guibou/nvidiaVersion

Browse Source 
Nvidia version
This commit is contained in:
Guillaume Bouchard 2018-02-19 16:43:23 +01:00 committed by GitHub
commit 40f4fb4c18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
README.md
View File

@ -28,21 +28,52 @@ Clone this git repository:
```
git clone https://github.com/guibou/nixGL
```
Build / install
```
cd nixGL
nix-build -A XXX
```
## Optional (if NVIDIA) Grab your NVIDIA driver version
Using `glxinfo` from your host system, grab the driver version, here `390.25`:
```
$ glxinfo | grep NVIDIA
...
OpenGL core profile version string: 4.5.0 NVIDIA 390.25
...
```
## Build
For intel:
```
nix-build -A nixGLIntel
```
For NVIDIA alone:
```
nix-build -A nixGLNvidia --argstr nvidiaVersion 390.25
```
(replace `390.25` with the host driver version gathered earlier.)
For Nvidia with bumblebee:
```
nix-build -A nixGLNvidiaBumblebee --argstr nvidiaVersion 390.25
```
(replace `390.25` with the host driver version gathered earlier.)
## Install
```
nix-env -i ./result
```
XXX can be one of:
(Note, you can iterate many time on this process to install as many driver as needed. Common example are `nixGLIntel` with `nixGLNvidiaBumblebee`)
- `nixGLNvidia`: Nvidia driver without bumblebee
- `nixGLNvidiaBumblebee`: Nvidia driver with bumblebee
- `nixGLIntel`: Intel driver
# Usage
@ -61,15 +92,4 @@ OpenGL version string: 4.6.0 NVIDIA 390.25
# Limitations
The idea is really simple and should work reliably in most cases. It
can be easily extended to AMD drivers, I just don't have the hardware
to test. Contact me.
*Important*: You need an host system driver which match the nixpkgs one. For example, at the time of this writing, nixpkgs contains nvidia `390.25`. Your host system must contain the same version. This limitation can be lifted by using a different version of nixpkgs:
```shell
export NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-14.12.tar.gz
nix-build -A nixGLNvidia
```
Contact me if this limitation is too important, it may be easy to automate this process.
Does not work now for AMD drivers because I dont' have the hardware.

23
default.nix
View File

@ -1,4 +1,6 @@
{ system ? builtins.currentSystem }:
{ system ? builtins.currentSystem,
nvidiaVersion ? null
}:
let
pkgs = import <nixpkgs> { inherit system; };
@ -7,8 +9,19 @@ let
in
with pkgs;
rec {
nvidiaLibsOnly = (linuxPackages.nvidia_x11.override {
libsOnly = true;
kernel = null;
}).overrideAttrs(oldAttrs: rec {
name = "nvidia-${nvidiaVersion}";
src = fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86_64/${nvidiaVersion}/NVIDIA-Linux-x86_64-${nvidiaVersion}.run";
sha256 = null;
};
});
nixGLNvidiaBumblebee = runCommand "nixGLNvidiaBumblebee-${version}" {
buildInputs = [ libglvnd linuxPackages.nvidia_x11 bumblebee ];
buildInputs = [ libglvnd nvidiaLibsOnly bumblebee ];
meta = with pkgs.stdenv.lib; {
description = "A tool to launch OpenGL application on system other than NixOS - Nvidia bumblebee version";
@ -18,7 +31,7 @@ rec {
mkdir -p $out/bin
cat > $out/bin/nixGLNvidiaBumblebee << FOO
#!/usr/bin/env sh
export LD_LIBRARY_PATH=${linuxPackages.nvidia_x11}/lib
export LD_LIBRARY_PATH=${nvidiaLibsOnly}/lib
${bumblebee}/bin/optirun --ldpath ${libglvnd}/lib "\$@"
FOO
@ -26,7 +39,7 @@ rec {
'';
nixGLNvidia = runCommand "nixGLNvidia-${version}" {
buildInputs = [ libglvnd linuxPackages.nvidia_x11 ];
buildInputs = [ libglvnd nvidiaLibsOnly ];
meta = with pkgs.stdenv.lib; {
description = "A tool to launch OpenGL application on system other than NixOS - Nvidia version";
@ -36,7 +49,7 @@ rec {
mkdir -p $out/bin
cat > $out/bin/nixGLNvidia << FOO
#!/usr/bin/env sh
export LD_LIBRARY_PATH=${linuxPackages.nvidia_x11}/lib:${libglvnd}/lib
export LD_LIBRARY_PATH=${nvidiaLibsOnly}/lib:${libglvnd}/lib
"\$@"
FOO