diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-05 18:05:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 18:05:57 -0400 |
| commit | bb0febf575bb847e632a507e2c3b75eb0ec63b01 (patch) | |
| tree | dc8a3b53df11785addab6ae283af7fac6a402ad8 /pkgs/os-specific/linux | |
| parent | cdebd1c61f9dc713406ced66923bf9dd678d813c (diff) | |
| parent | ad20a4a1c328967c7e4abe211f3dd63bb68bf966 (diff) | |
| download | nixlib-bb0febf575bb847e632a507e2c3b75eb0ec63b01.tar nixlib-bb0febf575bb847e632a507e2c3b75eb0ec63b01.tar.gz nixlib-bb0febf575bb847e632a507e2c3b75eb0ec63b01.tar.bz2 nixlib-bb0febf575bb847e632a507e2c3b75eb0ec63b01.tar.lz nixlib-bb0febf575bb847e632a507e2c3b75eb0ec63b01.tar.xz nixlib-bb0febf575bb847e632a507e2c3b75eb0ec63b01.tar.zst nixlib-bb0febf575bb847e632a507e2c3b75eb0ec63b01.zip | |
Merge pull request #43079 from matthewbauer/rework-extra-pkgs
Rework stage.nix's extraPkgs
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 0fe0f3d92c92..b5435f23e71b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -12,7 +12,7 @@ , patches ? [] }: -{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch +{ stdenv, callPackage, pkgsi686Linux, fetchurl, fetchpatch , kernel ? null, xorg, zlib, 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 @@ -70,7 +70,7 @@ let disallowedReferences = optional (!libsOnly) [ kernel.dev ]; passthru = { - settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) { + settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) { withGtk2 = preferGtk2; withGtk3 = !preferGtk2; }; |