44fba6df79
Fixes the issue: https://github.com/NixOS/nixpkgs/issues/39149 Problem was that the Nvidia driver did not find the libxcb-glx at runtime. (cherry picked from commit bda072cafcef4cf5ff99828852ddc8e06ce1fdbf)
90 lines
2.8 KiB
Nix
90 lines
2.8 KiB
Nix
{ version
|
|
, sha256_32bit
|
|
, sha256_64bit
|
|
, settingsSha256
|
|
, persistencedSha256
|
|
, useGLVND ? true
|
|
, useProfiles ? true
|
|
, preferGtk2 ? false
|
|
, settings32Bit ? false
|
|
|
|
, prePatch ? ""
|
|
, patches ? []
|
|
}:
|
|
|
|
{ stdenv, callPackage, pkgsi686Linux, fetchurl
|
|
, kernel ? null, xorg, zlib, perl, nukeReferences
|
|
, # Whether to build the libraries only (i.e. not the kernel module or
|
|
# nvidia-settings). Used to support 32-bit binaries on 64-bit
|
|
# Linux.
|
|
libsOnly ? false
|
|
}:
|
|
|
|
with stdenv.lib;
|
|
|
|
assert (!libsOnly) -> kernel != null;
|
|
|
|
let
|
|
nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
|
|
pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
|
|
|
|
self = stdenv.mkDerivation {
|
|
name = "nvidia-x11-${version}${nameSuffix}";
|
|
|
|
builder = ./builder.sh;
|
|
|
|
src =
|
|
if stdenv.hostPlatform.system == "i686-linux" then
|
|
fetchurl {
|
|
url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
|
|
sha256 = sha256_32bit;
|
|
}
|
|
else if stdenv.hostPlatform.system == "x86_64-linux" then
|
|
fetchurl {
|
|
url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
|
|
sha256 = sha256_64bit;
|
|
}
|
|
else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";
|
|
|
|
patches = if libsOnly then null else patches;
|
|
inherit prePatch;
|
|
inherit version useGLVND useProfiles;
|
|
inherit (stdenv.hostPlatform) system;
|
|
|
|
outputs = [ "out" ] ++ optional (!libsOnly) "bin";
|
|
outputDev = if libsOnly then null else "bin";
|
|
|
|
kernel = if libsOnly then null else kernel.dev;
|
|
kernelVersion = if libsOnly then null else kernel.modDirVersion;
|
|
|
|
hardeningDisable = [ "pic" "format" ];
|
|
|
|
dontStrip = true;
|
|
dontPatchELF = true;
|
|
|
|
libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc ];
|
|
|
|
nativeBuildInputs = [ perl nukeReferences ]
|
|
++ optionals (!libsOnly) kernel.moduleBuildDependencies;
|
|
|
|
disallowedReferences = optional (!libsOnly) [ kernel.dev ];
|
|
|
|
passthru = {
|
|
settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) {
|
|
withGtk2 = preferGtk2;
|
|
withGtk3 = !preferGtk2;
|
|
};
|
|
persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256;
|
|
};
|
|
|
|
meta = with stdenv.lib; {
|
|
homepage = http://www.nvidia.com/object/unix.html;
|
|
description = "X.org driver and kernel module for NVIDIA graphics cards";
|
|
license = licenses.unfreeRedistributable;
|
|
platforms = [ "i686-linux" "x86_64-linux" ];
|
|
maintainers = [ maintainers.vcunat ];
|
|
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
|
|
};
|
|
};
|
|
|
|
in self
|