diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-27 16:40:33 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-27 16:43:54 +0300 |
| commit | 4b67702e5bbed2471cd550e38dcff8ed9313e73f (patch) | |
| tree | c81c4cb881b12a5363e16ece9ee1b07df306c9fc /pkgs/os-specific/linux/nvidia-x11 | |
| parent | 00e5b20d1789d8527eb54c84cefef47369003d7c (diff) | |
| download | nixlib-4b67702e5bbed2471cd550e38dcff8ed9313e73f.tar nixlib-4b67702e5bbed2471cd550e38dcff8ed9313e73f.tar.gz nixlib-4b67702e5bbed2471cd550e38dcff8ed9313e73f.tar.bz2 nixlib-4b67702e5bbed2471cd550e38dcff8ed9313e73f.tar.lz nixlib-4b67702e5bbed2471cd550e38dcff8ed9313e73f.tar.xz nixlib-4b67702e5bbed2471cd550e38dcff8ed9313e73f.tar.zst nixlib-4b67702e5bbed2471cd550e38dcff8ed9313e73f.zip | |
linuxPackages.nvidia_x11_legacy304.settings: force i686
This legacy settings application doesn't support x86_64.
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 4f753a5cb6a3..57899d6f893f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -46,6 +46,7 @@ rec { persistencedSha256 = null; useGLVND = false; useProfiles = false; + settings32Bit = true; prePatch = let debPatches = fetchurl { diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index c8ae7cefb5ab..13e5d1b76ea6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -6,6 +6,7 @@ , useGLVND ? true , useProfiles ? true , preferGtk2 ? false +, settings32Bit ? false , prePatch ? "" , patches ? [] @@ -68,7 +69,7 @@ let disallowedReferences = optional (!libsOnly) [ kernel.dev ]; passthru = { - settings = callPackage (import ./settings.nix self settingsSha256) { + settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) { withGtk2 = preferGtk2; withGtk3 = !preferGtk2; }; |