summary refs log tree commit diff
path: root/pkgs/os-specific/linux/chromium-os
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-05-23 17:11:39 +0000
committerAlyssa Ross <hi@alyssa.is>2020-05-24 22:44:30 +0000
commitf24d310275909265de32cbc831d5832cbccc68ee (patch)
treeee8ce96b061f406147fd2c64ad9705aca9c342f8 /pkgs/os-specific/linux/chromium-os
parentc5c894f4f357344c411b8419b14ee9cb61e020fa (diff)
downloadnixpkgs-f24d310275909265de32cbc831d5832cbccc68ee.tar
nixpkgs-f24d310275909265de32cbc831d5832cbccc68ee.tar.gz
nixpkgs-f24d310275909265de32cbc831d5832cbccc68ee.tar.bz2
nixpkgs-f24d310275909265de32cbc831d5832cbccc68ee.tar.lz
nixpkgs-f24d310275909265de32cbc831d5832cbccc68ee.tar.xz
nixpkgs-f24d310275909265de32cbc831d5832cbccc68ee.tar.zst
nixpkgs-f24d310275909265de32cbc831d5832cbccc68ee.zip
linux_cros: virtwl: Support multiple host sockets
This is necessary to be able to provide a memfd server in addition to
the main socket.
Diffstat (limited to 'pkgs/os-specific/linux/chromium-os')
-rw-r--r--pkgs/os-specific/linux/chromium-os/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/chromium-os/default.nix b/pkgs/os-specific/linux/chromium-os/default.nix
index 1bed1ff7b46..f75891fee9b 100644
--- a/pkgs/os-specific/linux/chromium-os/default.nix
+++ b/pkgs/os-specific/linux/chromium-os/default.nix
@@ -30,13 +30,15 @@ let
     };
 
     linux_5_4 = callPackage ../kernel/linux-cros.nix {
-      inherit (linux_5_4) kernelPatches;
+      kernelPatches = linux_5_4.kernelPatches ++ (with kernelPatches; [
+        virtwl_multiple_sockets
+      ]);
     };
 
     linux = self.linux_5_4;
 
     linuxHeaders = (makeLinuxHeaders {
-      inherit (linux) version src;
+      inherit (linux) version src patches;
     });
 
     minigbm = callPackage ./minigbm { };