diff options
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 91 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 25 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 21 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/settings.nix | 12 |
5 files changed, 85 insertions, 74 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index dbe18ace40a..e6ad62b1128 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -20,7 +20,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES + make IGNORE_PREEMPT_RT_PRESENCE=1 NV_BUILD_SUPPORTS_HMM=1 SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES cd .. fi @@ -84,8 +84,14 @@ installPhase() { else sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed fi - install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia.json + + if [ "$system" = "i686-linux" ]; then + install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json + else + install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.json + fi fi + if [ -e nvidia_layers.json ]; then sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_layers.json > nvidia_layers.json.fixed install -Dm644 nvidia_layers.json.fixed $i/share/vulkan/implicit_layer.d/nvidia_layers.json diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index df71a953fee..2cf9cddef4d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,44 +1,57 @@ -{ lib, callPackage, fetchpatch, fetchurl, stdenv }: +{ lib, callPackage, fetchpatch, fetchurl, stdenv, pkgsi686Linux }: let - -generic = args: -if ((!lib.versionOlder args.version "391") + generic = args: let + imported = import ./generic.nix args; + in if ((!lib.versionOlder args.version "391") && stdenv.hostPlatform.system != "x86_64-linux") then null - else callPackage (import ./generic.nix args) { }; + else callPackage imported { + lib32 = (pkgsi686Linux.callPackage imported { + libsOnly = true; + kernel = null; + }).out; + }; + kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; - - maybePatch_drm_legacy = - lib.optional (lib.versionOlder "4.14" (kernel.version or "0")) - (fetchurl { - url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1" - + "/packages/x11/driver/xf86-video-nvidia-legacy/patches/" - + "xf86-video-nvidia-legacy-0010-kernel-4.14.patch"; - sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5"; - }); in rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "450.66"; - sha256_64bit = "1a6va0gvbzpkyza693v2ml1is4xbv8wxasqk0zd5y7rxin94c1ms"; - settingsSha256 = "0mkgs91gx7xb7f24xkq9fl7i8d4l7s0wr9a44b1gm1vkw82fm7lj"; - persistencedSha256 = "02id8cg8fba7c1j4m6vj4gp2mv39lz2k557kdjw8lszcpw6f1fhh"; + version = "460.73.01"; + sha256_64bit = "120ymf59l6nipczszf82lrm2p4ihhqyv2pfwwfg9wy96vqcckc8i"; + settingsSha256 = "08jh7g34p9yxv5fh1cw0r2pjx65ryiv3w2lk1qg0gxn2r7xypkx0"; + persistencedSha256 = "040gx4wqp3hxcfb4aba4sl7b01ixr5slhzw0xldwcqlmhpwqphi5"; } else legacy_390; - # No active beta right now - beta = stable; + beta = generic { + version = "470.42.01"; + sha256_64bit = "04w9nmi3vyww07pmgbd2r1x37s5p6xiy4qg9s06a1kjwzpm59xfd"; + settingsSha256 = "Ohbkm7j0/V0kzcxfsHujBkrdnaefneoLutf2Rju2hIQ="; + persistencedSha256 = "1gfj4ffkidbhgjzdi6sv2sngdcb27w7b0rvfnj129rs36mcxy02j"; + }; + + # Vulkan developer beta driver + # See here for more information: https://developer.nvidia.com/vulkan-driver + vulkan_beta = generic rec { + version = "455.46.04"; + persistencedVersion = "455.45.01"; + settingsVersion = "455.45.01"; + sha256_64bit = "1iv42w3x1vc00bgn6y4w1hnfsvnh6bvj3vcrq8hw47760sqwa4xa"; + settingsSha256 = "09v86y2c8xas9ql0bqr7vrjxx3if6javccwjzyly11dzffm02h7g"; + persistencedSha256 = "13s4b73il0lq2hs81q03176n16mng737bfsp3bxnxgnrv3whrayz"; + url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; + }; # Last one supporting x86 legacy_390 = generic { - version = "390.138"; - sha256_32bit = "0y3qjygl0kfz9qs0rp9scn1k3l8ym9dib7wpkyh5gs4klcip7xkv"; - sha256_64bit = "0rnnb5l4i8s76vlg6yvlrxhm2x9wdqw7k5hgf4fyaa3cr3k1kysz"; - settingsSha256 = "0ad6hwl56nvbdv9g85lw7ywadqvc2gaq9x6d2vjcia9kg4vrmfqx"; - persistencedSha256 = "15jciyq6i3pz1g67xzqlwmc62v3xswzhjcqmfcdndvlvhcibsimr"; + version = "390.143"; + sha256_32bit = "AelrdTTeo/3+ZdXK0iniZDB8gJUkeZQtNoRm25z+bQY="; + sha256_64bit = "tyKqcPM71ErK8ZZHLPtxmgrWzv6tfEmxBRveCSwTlO8="; + settingsSha256 = "EJPXZbxZS1CMENAYk9dCAIsHsRTXJpj473+JLuhGkWI="; + persistencedSha256 = "FtlPF3jCNr18NnImTmr8zJsaK9wbj/aWZ9LwoLr5SeE="; }; legacy_340 = generic { @@ -51,32 +64,4 @@ rec { patches = [ ./vm_operations_struct-fault.patch ]; }; - - legacy_304 = generic { - version = "304.137"; - sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a"; - sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb"; - settingsSha256 = "129f0j0hxzjd7g67qwxn463rxp295fsq8lycwm6272qykmab46cj"; - persistencedSha256 = null; - useGLVND = false; - useProfiles = false; - settings32Bit = true; - - prePatch = let - debPatches = fetchurl { - url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/" - + "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz"; - sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l"; - }; - prefix = "debian/module/debian/patches"; - applyPatches = pnames: if pnames == [] then null else - '' - tar xf '${debPatches}' - sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch - patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}" - ''; - in applyPatches [ "fix-typos" ]; - patches = maybePatch_drm_legacy; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; - }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index d62ade04e63..2d325ab3d56 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -1,8 +1,11 @@ { version +, url ? null , sha256_32bit ? null , sha256_64bit , settingsSha256 +, settingsVersion ? version , persistencedSha256 +, persistencedVersion ? version , useGLVND ? true , useProfiles ? true , preferGtk2 ? false @@ -11,17 +14,22 @@ , prePatch ? "" , patches ? [] , broken ? false -}: +}@args: -{ stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl +{ lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl , kernel ? null, 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 +, # don't include the bundled 32-bit libraries on 64-bit platforms, + # even if it’s in downloaded binary + disable32Bit ? false + # 32 bit libs only version of this package +, lib32 ? null }: -with stdenv.lib; +with lib; assert !libsOnly -> kernel != null; assert versionOlder version "391" -> sha256_32bit != null; @@ -30,7 +38,7 @@ assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-lin let nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; - i686bundled = versionAtLeast version "391"; + i686bundled = versionAtLeast version "391" && !disable32Bit; libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11 pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ]; @@ -43,12 +51,12 @@ let src = 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"; + url = args.url or "https://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; sha256 = sha256_64bit; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; + url = args.url or "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; sha256 = sha256_32bit; } else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; @@ -86,9 +94,12 @@ let withGtk3 = !preferGtk2; }; persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; + inherit persistencedVersion settingsVersion; + } // optionalAttrs (!i686bundled) { + inherit lib32; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nvidia.com/object/unix.html"; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index de36ad06c60..9a3daa3d270 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,19 +1,25 @@ nvidia_x11: sha256: -{ stdenv, fetchFromGitHub, m4 }: - -stdenv.mkDerivation { +{ stdenv +, lib +, fetchFromGitHub +, m4 +, libtirpc +}: + +stdenv.mkDerivation rec { pname = "nvidia-persistenced"; - inherit (nvidia_x11) version; + version = nvidia_x11.persistencedVersion; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-persistenced"; - rev = nvidia_x11.version; + rev = nvidia_x11.persistencedVersion; inherit sha256; }; nativeBuildInputs = [ m4 ]; + buildInputs = [ libtirpc ]; installFlags = [ "PREFIX=$(out)" ]; @@ -27,7 +33,10 @@ stdenv.mkDerivation { $out/bin/nvidia-persistenced ''; - meta = with stdenv.lib; { + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; + + meta = with lib; { homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index b1250e56ee0..d5bbf40e2b8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchFromGitHub, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau +{ stdenv, lib, fetchFromGitHub, pkg-config, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: @@ -9,13 +9,13 @@ let src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-settings"; - rev = nvidia_x11.version; + rev = nvidia_x11.settingsVersion; inherit sha256; }; libXNVCtrl = stdenv.mkDerivation { pname = "libXNVCtrl"; - inherit (nvidia_x11) version; + version = nvidia_x11.settingsVersion; inherit src; buildInputs = [ libXrandr libXext ]; @@ -42,10 +42,10 @@ in stdenv.mkDerivation { pname = "nvidia-settings"; - inherit (nvidia_x11) version; + version = nvidia_x11.settingsVersion; inherit src; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; @@ -97,7 +97,7 @@ stdenv.mkDerivation { inherit libXNVCtrl; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; |