diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11')
3 files changed, 20 insertions, 6 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index dbe18ace40a2..5baa4aa51e59 100755 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -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/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 7c37fcf231fc..b16dd3997f60 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ 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 = "455.45.01"; + sha256_64bit = "6tyMfggvZVQPp/aiSdgwn7VG/mIGb0lUcnAdyMEDoVM="; + settingsSha256 = "70ABqnO/heCp/5IztpU0Lo7eZd4n4wUoTlp1xIQ3aCc="; + persistencedSha256 = "36sM+djZvm77Gle7dcZ5tppgzQkD4IA0FJgCGsdZRI8="; } else legacy_390; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index ff2792ac315d..5979f7e9a224 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,6 +1,10 @@ nvidia_x11: sha256: -{ stdenv, fetchFromGitHub, m4 }: +{ stdenv +, fetchFromGitHub +, m4 +, libtirpc +}: stdenv.mkDerivation rec { pname = "nvidia-persistenced"; @@ -14,6 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 ]; + buildInputs = [ libtirpc ]; installFlags = [ "PREFIX=$(out)" ]; @@ -27,6 +32,9 @@ stdenv.mkDerivation rec { $out/bin/nvidia-persistenced ''; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; + meta = with stdenv.lib; { homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; |