Commit graph

63 commits

Author SHA1 Message Date
ilian d3b3fa80a9 nvidia-x11: ignore linux-rt sanity check
Ignore the sanity check that prevents the Nvidia drivers from
being built for kernels with real-time patches.
Even though the driver might not be officially supported by
Nvidia for linux-rt, it seems to work without issues.
Attempting to install the driver for linux-rt fails with the
following error message:

The kernel you are installing for is a PREEMPT_RT kernel!

The NVIDIA driver does not support real-time kernels. If you
are using a stock distribution kernel, please install
a variant of this kernel that does not have the PREEMPT_RT
patch set applied; if this is a custom kernel, please
install a standard Linux kernel.  Then try installing the
NVIDIA kernel module again.

*** Failed PREEMPT_RT sanity check. Bailing out! ***
2021-01-24 23:15:24 +01:00
Edmund Wu 0f322400ea
nvidia_x11: fix vulkan icd filename 2020-11-16 14:04:16 -05:00
Edmund Wu 9a269f555a
nixos/nvidia: include systemd power management 2020-05-10 11:25:50 -04:00
gnidorah d48ed3b9e5
nvidia_x11: fix *nvidia*.so* references 2019-12-10 11:35:30 -05:00
Ambroz Bizjak d156b2b619 nvidia-x11: Make vulkan library path absolute for >= 435.
The original file contains just a library name, which does not work when LD_LIBRARY_PATH does not contain /run/opengl-driver/lib, as is the case in unstable NixOS.

Fixes https://github.com/NixOS/nixpkgs/issues/69264
2019-10-02 10:09:50 +03:00
Averell Dalton af39568c3a nvidia_x11: fix for vulkan in >= 435 2019-09-06 21:18:49 +02:00
Matthew Bauer 87ec2627b0
Merge pull request #62870 from ambrop72/nvidia-icd-absolute
nvidia-x11: Put absolute library paths into ICD config files.
2019-07-10 17:37:00 -04:00
Ambroz Bizjak d1226bff8e nvidia-x11: Set 32-bit library paths for 32-bit libraries.
Patchelf was being called to point RUNPATH to 64-bit library paths even for 32-bit libraries.
2019-06-15 10:54:50 +02:00
Ambroz Bizjak a4de5673de nvidia-x11: Put absolute library paths into ICD config files. 2019-06-08 20:34:27 +02:00
Dmitry Kalinkin 0baa7c90c6
Merge pull request #56211 from eadwu/nvidia_x11/2019-02-22
nvidia_x11: 2019-02-22
2019-03-06 21:10:22 -05:00
Averell Dalton d6c2fe76ed nvidia-docker: init at 2.0.3
nvidia_x11 and persistenced were modified to provide binaries which can be
mounted inside a docker-container to be executed there.

most ldconfig-based discovery of bundled nvidia libraries is patched out

ldconfig itself is patched to be able to deal with patchelf'ed libraries
See https://sourceware.org/bugzilla/show_bug.cgi?id=23964
2019-02-27 09:56:03 +01:00
Edmund Wu 48e66e5184
nvidia_x11: 415.27 -> 418.43 2019-02-22 13:00:19 -05:00
Edmund Wu ee32fa9b0d nvidia_x11: 410.78 -> 415.25 2019-01-13 09:37:06 +01:00
Edmund Wu 21bb1fa004
nvidia_x11_beta: reinit at 410.57 2018-10-17 19:30:44 -04:00
dukzcry 9645c867a3 nvidia-x11: pass kernel.modDirVersion 2018-06-24 11:49:48 +03:00
Jan Solanti 4ec3d311cb nvidia-x11: generate nvidia_icd.json from template 2017-09-26 21:53:44 +02:00
Kosyrev Serge d860a68fd0 nvidia-x11: $bin can be empty 2017-03-19 05:29:57 +03:00
Nikolay Amiantov 22750b36fd nvidia: support application profiles
Closes #22666.
2017-02-19 19:46:01 +03:00
Jude Taylor c3e3b6a19a
nvidia-x11: fix parallel building variable name 2017-02-11 14:29:37 -08:00
Frederik Rietdijk bab37c73ac nvidia-x11: undo parallel building
In ffc498c490 -j$NIX_BUILD_JOBS was added.
Somehow this caused my machine to run many many more parallel jobs than
it was supposed to, freezing the system.

If you don't experience this, feel free to revert.
2017-02-11 15:50:22 +01:00
Nikolay Amiantov 2fd2fcf54d linuxPackages.nvidia_x11: refactor, build more from source
* Use libglvnd;
* Compile nvidia-settings, nvidia-persistenced from source;
* Generalize builder.
2017-02-08 16:57:46 +03:00
Jude Taylor ffc498c490
nvidia_x11: add missing vulkan files 2017-01-28 19:47:25 -08:00
Nikolay Amiantov 05eee18e7a linuxPackages.nvidia_x11: fix OpenCL support
* Move OpenCL .icd file to the right place;
* Remove libOpenCL.so (we use ocl-icd instead).
2017-01-20 03:37:51 +03:00
Eelco Dolstra 59ef7d25c3 nvidia-x11: 358.16 -> 361.42
This fixes the segfault reported in #13942 caused by missing
libEGL.so.0 and libEGL_nvidia.so.0 symlinks.
2016-04-06 15:53:14 +02:00
Vladimír Čunát a1de225913 Revert "nvidia: 358.16 -> 361.28" to fix #13942
This reverts commit e0fe8cf204.
Befor updating we need to fixup problems related to GLVND transition.
2016-03-16 20:08:41 +01:00
Svein Ove Aas e0fe8cf204 nvidia: major update 358.16 -> 361.28
Beta also gets updated, but even upstream it's older than stable.
vcunat generalized parallel make. Close #12719.
2016-03-07 23:14:44 +01:00
Nikolay Amiantov 6563fa6125 nvidia_x11: move vdpau libraries to lib/vdpau 2016-01-26 04:30:26 +03:00
Svein Ove Aas 805d453bc2 nvidia: branch update 352.63 -> 358.16 (close #12272)
Tested & reviewed by vcunat:
- the patch seems not needed anymore,
- reflects changes in their build system
  ftp://download.nvidia.com/XFree86/packaging/linux/new-kbuild-for-355/README
2016-01-14 12:32:53 +01:00
Vladimír Čunát 1464a4de57 nvidia-x11: don't install libvdpau* that we have already
Besides being redundant to inject libvdpau via LD_LIBRARY_PATH,
currently the drivers come with a vulnerable version.
https://devtalk.nvidia.com/default/topic/873035
2015-09-01 13:27:12 +02:00
Vladimír Čunát 374210aece nvidia-x11: maintenance update
Strange as it is, nvidia seems to drop UVM kernel module on 32-bit.
Basic driver usage shows no problems for me.
2015-07-30 15:35:02 +02:00
Spencer Janssen ebe67d3c85 nvidia-x11: add a symlink for libGLESv2.so.2 (close #9024)
nvidia's EGL stack looks for libGLESv2.so.2 at runtime (confirmed by
watching strace), however builder.sh only provides a libGLESv2.so.1
symlink.

@vcunat ported to legacy_340; older ones don't produce GLES.
2015-07-28 12:43:58 +02:00
Eelco Dolstra 165406e1af nvidia-x11: Remove runtime dependency on linux.dev 2015-07-26 22:45:39 +02:00
Eelco Dolstra 06dfa19b99 nvidia-x11: Use GTK 2
Otherwise we end up with multiple versions of GTK in the system
closure. Also, GTK 3 is not well integrated in NixOS yet (e.g. it
doesn't respect KDE's colour scheme).
2015-03-02 00:23:43 +01:00
Vladimír Čunát 3009cc116e nvidia_x11: fix missing xorg lib symlinks; refactor
The builder structure should be now easier to understand
and easier to avoid such problems in future.
Fixes #6546.
2015-02-24 13:17:56 +01:00
Vladimír Čunát 7bf2021349 nvidia_x11: reintroduce libXv for nvidia-settings
It was dropped in 77986803a6.
2015-02-21 17:28:02 +01:00
Vladimír Čunát 77986803a6 nvidia_x11: fix nvidia-settings after the major update
The GUI would no longer find libs it needed.
Now it's gtk3 by default, so we don't support gtk2 version for simplicity.
ldd finds no missing libs after this commit.
2015-02-21 16:07:53 +01:00
Shea Levy 05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
Vladimír Čunát fd9d8edc51 nvidia_x11: add 343 branch as the default (close #5070)
It's just a plain copy of the 340 expressions (only hash and version changed).
2014-12-24 00:06:46 +01:00
Vladimír Čunát d39c6ceffc nvidia_x11: current long-lived becomes a new legacy
CC: #5070.
2014-11-24 22:39:00 +01:00
Vladimír Čunát 25351012b2 nvidia: fix problems with -glsi and glx
..by generalizing the build script.
Obsoletes #3699, and it should finally fix problems around 816d971a.
2014-08-20 23:37:41 +02:00
Vladimír Čunát 2015aecd44 Revert "Copy all so files over from nVidia blob"
This reverts commit 816d971aea.
See discussion on https://github.com/Fuuzetsu/nixpkgs/commit/816d971ae
2014-08-20 02:22:29 +02:00
Mateusz Kowalczyk 816d971aea Copy all so files over from nVidia blob 2014-08-09 01:57:42 +02:00
Mateusz Kowalczyk a5ee903e60 Copy over libGLESv2 and libEGL too for nVidia blob 2014-08-09 01:07:39 +02:00
Eelco Dolstra 6c0002ec8d nvidia-x11: Update to 340.24 2014-07-15 19:53:39 +02:00
Rob Vermaas ce87d3e307 Merge pull request #2465 from robberer/nvidia/driver
nvidia-x11: add nvidia-uvm module which is necessary for blender GPU support
2014-05-28 08:30:22 +02:00
Eelco Dolstra fc70d6f712 nvidia-x11: Don't install nvidia-xconfig
Rewriting the X11 config doesn't work on NixOS.
2014-05-22 13:00:52 +02:00
Eelco Dolstra 5ec3a63fcb nvidia-x11: Update to 331.79 2014-05-22 13:00:51 +02:00
robberer 9683c6e806 add nvidia-uvm module which is necessary for blender GPU support 2014-05-01 16:37:14 +02:00
Shea Levy a589bfae17 Update and fix kernel packages to new kernel build
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-04 21:17:04 -05:00
Aristid Breitkreuz 147a6ae62f nvidia: also install useful nvidia-smi tool 2013-07-21 19:32:54 +02:00