git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #95864 from obsidiansystems/nvidia-x11-no32bit

nvidia-x11: add disable32Bit arg to not include 32-bit nvidia

commit10ee14442dc94c1db1bb250fb8ca2ee9afa17201 authorMatthew Bauer <mjbauer95@gmail.com> dateSat 29 Aug 2020, 22:09 (6 years ago) parente06e69931d8669
1 file changed+4−1
pkgs/os-specific/linux/nvidia-x11/generic.nix+4−1
pkgs/os-specific/linux/nvidia-x11/generic.nix+4−1
@@ -19,6 +19,9 @@
1919 # nvidia-settings). Used to support 32-bit binaries on 64-bit
2020 # Linux.
2121 libsOnly ? false
22+, # don't include the bundled 32-bit libraries on 64-bit platforms,
23+ # even if it’s in downloaded binary
24+ disable32Bit ? false
2225}:
2326
2427with stdenv.lib;
@@ -30,7 +33,7 @@ assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-lin
3033let
3134 nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
3235 pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
33− i686bundled = versionAtLeast version "391";
36+ i686bundled = versionAtLeast version "391" && !disable32Bit;
3437
3538 libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11
3639 pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ];