mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

treewide: remove pkgs_i686

Browse source 
This was getting evaluated eagerly causing assertion failures in
aarch64 systems. We can replace usages of pkgs_i686 with
pkgs.pkgsi686Linux.
This commit is contained in:
Matthew Bauer 2018-11-03 00:55:57 -05:00
parent b3ab4d1f8e
commit 4a8fc5b9aa
7 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/config/pulseaudio.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs_i686, ... }: { config, lib, pkgs, ... }:
with pkgs; with pkgs;
with lib; with lib;
@ -19,7 +19,7 @@ let
# Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
# using 32bit alsa on 64bit linux. # using 32bit alsa on 64bit linux.
enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null); enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsaLib != null && pkgs.pkgsi686Linux.libpulseaudio != null);
myConfigFile = myConfigFile =
@ -63,7 +63,7 @@ let
pcm_type.pulse { pcm_type.pulse {
libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ; libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;
${lib.optionalString enable32BitAlsaPlugins ${lib.optionalString enable32BitAlsaPlugins
"libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"} "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
} }
pcm.!default { pcm.!default {
type pulse type pulse
@ -72,7 +72,7 @@ let
ctl_type.pulse { ctl_type.pulse {
libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;
${lib.optionalString enable32BitAlsaPlugins ${lib.optionalString enable32BitAlsaPlugins
"libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
} }
ctl.!default { ctl.!default {
type pulse type pulse

4
nixos/modules/hardware/opengl.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs_i686, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -148,7 +148,7 @@ in
[ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share"; [ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share";
hardware.opengl.package = mkDefault (makePackage pkgs); hardware.opengl.package = mkDefault (makePackage pkgs);
hardware.opengl.package32 = mkDefault (makePackage pkgs_i686); hardware.opengl.package32 = mkDefault (makePackage pkgs.pkgsi686Linux);
boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions; boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
}; };

4
nixos/modules/hardware/video/amdgpu-pro.nix
View file

@ -1,6 +1,6 @@
# This module provides the proprietary AMDGPU-PRO drivers. # This module provides the proprietary AMDGPU-PRO drivers.
{ config, lib, pkgs, pkgs_i686, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -11,7 +11,7 @@ let
enabled = elem "amdgpu-pro" drivers; enabled = elem "amdgpu-pro" drivers;
package = config.boot.kernelPackages.amdgpu-pro; package = config.boot.kernelPackages.amdgpu-pro;
package32 = pkgs_i686.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; }; package32 = pkgs.pkgsi686Linux.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
opengl = config.hardware.opengl; opengl = config.hardware.opengl;

4
nixos/modules/hardware/video/ati.nix
View file

@ -1,6 +1,6 @@
# This module provides the proprietary ATI X11 / OpenGL drivers. # This module provides the proprietary ATI X11 / OpenGL drivers.
{ config, lib, pkgs_i686, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -24,7 +24,7 @@ in
{ name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; }; { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };
hardware.opengl.package = ati_x11; hardware.opengl.package = ati_x11;
hardware.opengl.package32 = pkgs_i686.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; }; hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
environment.systemPackages = [ ati_x11 ]; environment.systemPackages = [ ati_x11 ];

4
nixos/modules/hardware/video/nvidia.nix
View file

@ -1,6 +1,6 @@
# This module provides the proprietary NVIDIA X11 / OpenGL drivers. # This module provides the proprietary NVIDIA X11 / OpenGL drivers.
{ stdenv, config, lib, pkgs, pkgs_i686, ... }: { stdenv, config, lib, pkgs, ... }:
with lib; with lib;
@ -25,7 +25,7 @@ let
nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
nvidia_libs32 = nvidia_libs32 =
if versionOlder nvidia_x11.version "391" then if versionOlder nvidia_x11.version "391" then
((nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }).out ((nvidiaForKernel pkgs.pkgsi686Linux.linuxPackages).override { libsOnly = true; kernel = null; }).out
else else
(nvidiaForKernel config.boot.kernelPackages).lib32; (nvidiaForKernel config.boot.kernelPackages).lib32;

1
nixos/modules/misc/nixpkgs.nix
View file

@ -208,7 +208,6 @@ in
config = { config = {
_module.args = { _module.args = {
pkgs = cfg.pkgs; pkgs = cfg.pkgs;
pkgs_i686 = cfg.pkgs.pkgsi686Linux;
}; };
}; };
} }

4
nixos/modules/virtualisation/parallels-guest.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs_i686, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -64,7 +64,7 @@ in
}; };
hardware.opengl.package = prl-tools; hardware.opengl.package = prl-tools;
hardware.opengl.package32 = pkgs_i686.linuxPackages.prl-tools.override { libsOnly = true; kernel = null; }; hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.prl-tools.override { libsOnly = true; kernel = null; };
services.udev.packages = [ prl-tools ]; services.udev.packages = [ prl-tools ];