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

Merge pull request #53511 from joachifm/kernel-32bit-emu-feature-flag

Browse Source 
linux: flag to indicate 32bit emulation support
This commit is contained in:
Joachim F 2019-01-25 14:13:45 +00:00 committed by GitHub
commit f6414428ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/hardware/opengl.nix
View File

@ -124,10 +124,14 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = lib.singleton { assertions = [
assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; { assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64;
message = "Option driSupport32Bit only makes sense on a 64-bit system."; message = "Option driSupport32Bit only makes sense on a 64-bit system.";
}; }
{ assertion = cfg.driSupport32Bit -> (config.boot.kernelPackages.kernel.features.ia32Emulation or false);
message = "Option driSupport32Bit requires a kernel that supports 32bit emulation";
}
];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /run/opengl-driver - - - - ${package}" "L+ /run/opengl-driver - - - - ${package}"

1
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -65,6 +65,7 @@ let
netfilterRPFilter = true; netfilterRPFilter = true;
grsecurity = false; grsecurity = false;
xen_dom0 = false; xen_dom0 = false;
ia32Emulation = true;
} // features) kernelPatches; } // features) kernelPatches;
intermediateNixConfig = import ./common-config.nix { intermediateNixConfig = import ./common-config.nix {

1
pkgs/top-level/all-packages.nix
View File

@ -14870,6 +14870,7 @@ in
# Hardened linux # Hardened linux
hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override {
features.ia32Emulation = false;
extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
inherit stdenv; inherit stdenv;
inherit (kernel) version; inherit (kernel) version;