diff options
author | Joe Hermaszewski <git@monoid.al> | 2020-09-24 22:53:05 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-24 10:53:05 -0400 |
commit | 99d2db8dce032a47430117f27f6c4fe97e8b07ff (patch) | |
tree | 443aacb24352a7ae589af3b8773fde3430a249aa /pkgs/os-specific/linux/nvidia-x11/generic.nix | |
parent | f5061117b2b1b4df42190238d8d496337d8d9fd3 (diff) | |
download | nixpkgs-99d2db8dce032a47430117f27f6c4fe97e8b07ff.tar nixpkgs-99d2db8dce032a47430117f27f6c4fe97e8b07ff.tar.gz nixpkgs-99d2db8dce032a47430117f27f6c4fe97e8b07ff.tar.bz2 nixpkgs-99d2db8dce032a47430117f27f6c4fe97e8b07ff.tar.lz nixpkgs-99d2db8dce032a47430117f27f6c4fe97e8b07ff.tar.xz nixpkgs-99d2db8dce032a47430117f27f6c4fe97e8b07ff.tar.zst nixpkgs-99d2db8dce032a47430117f27f6c4fe97e8b07ff.zip |
nvidia-x11.vulkan_beta: init at 450.56.11 (#97882)
- This is fetched from a different URL, so allow passing that explicitly. - There also isn't an nvidia-persistenced or nvidia-settings release for this version, so use 450.57 instead. Also implement passing persistenced and settings version explicitly. Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/generic.nix')
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 63091e9875f..8a9e340a20a 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,7 +14,7 @@ , prePatch ? "" , patches ? [] , broken ? false -}: +}@args: { stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl , kernel ? null, perl, nukeReferences @@ -46,12 +49,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://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}"; @@ -89,6 +92,7 @@ let withGtk3 = !preferGtk2; }; persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; + inherit persistencedVersion settingsVersion; }; meta = with stdenv.lib; { |