public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove callPackage_i686

Browse Source 
This has been replaced with pkgsi686Linux.callPackage
This commit is contained in:
Matthew Bauer
2018-07-05 14:04:52 -04:00
parent 5b357d9037
commit c491a99362
7 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/nvidia-x11/generic.nix
+2 -2
View File
@@ -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;
};