summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-06-10 00:27:33 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-06-10 00:28:01 +0300
commit62b75c64d440d3102777470cf8cb7173cc805b01 (patch)
treef80d34899d303c576fb6028859a2fe06ba073192 /pkgs/os-specific
parente1af50c4c4c0332136283e9231f0a32ac11f2b90 (diff)
downloadnixlib-62b75c64d440d3102777470cf8cb7173cc805b01.tar
nixlib-62b75c64d440d3102777470cf8cb7173cc805b01.tar.gz
nixlib-62b75c64d440d3102777470cf8cb7173cc805b01.tar.bz2
nixlib-62b75c64d440d3102777470cf8cb7173cc805b01.tar.lz
nixlib-62b75c64d440d3102777470cf8cb7173cc805b01.tar.xz
nixlib-62b75c64d440d3102777470cf8cb7173cc805b01.tar.zst
nixlib-62b75c64d440d3102777470cf8cb7173cc805b01.zip
kernel-config: Fix 4.0 build on 32-bit
KVM_COMPAT apparently enables 32-bit compability syscalls for KVM, and
as such can be enabled only on a 64-bit system.

Resolves error http://hydra.nixos.org/build/23014132/nixlog/1/raw:
GOT: #
GOT: # configuration written to .config
GOT: #
GOT: make[1]: Leaving directory '/tmp/nix-build-linux-config-4.0.5.drv-0/build'
GOT: make: Leaving directory '/tmp/nix-build-linux-config-4.0.5.drv-0/linux-4.0.5'
unused option: KVM_COMPAT
builder for ‘/nix/store/7kskdvmzs116f1fm55ghm0crjniw9q0a-linux-config-4.0.5.drv’ failed with exit code 255
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a972c4e60f89..cb7423f293a4 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -396,7 +396,7 @@ with stdenv.lib;
     KVM_CLOCK? y
   ''}
   ${optionalString (versionAtLeast version "4.0") ''
-    KVM_COMPAT y
+    KVM_COMPAT? y
   ''}
   ${optionalString (versionAtLeast version "3.10") ''
     KVM_DEVICE_ASSIGNMENT? y