diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-03 00:55:57 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-03 00:56:39 -0500 |
commit | 4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed (patch) | |
tree | 5e3bc7683f60afdc70bc0e201d05aca858b1896f /nixos/modules/hardware/opengl.nix | |
parent | b3ab4d1f8e6fc6897fe561039b14d360fe8164f8 (diff) | |
download | nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.gz nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.bz2 nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.lz nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.xz nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.zst nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.zip |
treewide: remove pkgs_i686
This was getting evaluated eagerly causing assertion failures in aarch64 systems. We can replace usages of pkgs_i686 with pkgs.pkgsi686Linux.
Diffstat (limited to 'nixos/modules/hardware/opengl.nix')
-rw-r--r-- | nixos/modules/hardware/opengl.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 46d06d71333..48e0072e089 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -148,7 +148,7 @@ in [ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share"; 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; }; |