diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-02-20 04:01:13 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-02-20 04:02:05 +0000 |
| commit | 515d3cfa24df96c9e134ac5b87c2396f81354551 (patch) | |
| tree | 5e67ec19079d3b44ada0c0ac88ccd411ac22070f /pkgs/os-specific/linux/chromium-os | |
| parent | 372bd003cd2d95a181ccd069322d2229f72acd8a (diff) | |
| parent | 7bdc103ac8424e08f02f6e9344979d0a821caa62 (diff) | |
| download | nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.gz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.bz2 nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.lz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.xz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.zst nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/os-specific/linux/chromium-os')
| -rw-r--r-- | pkgs/os-specific/linux/chromium-os/crosvm/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/chromium-os/default.nix | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix index 3e55df612f7..a243ee87f18 100644 --- a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix +++ b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix @@ -43,6 +43,9 @@ in ./default-seccomp-policy-dir.diff ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1d7y07wkliy5qnlyx5zj6ni39avhs3s48sqgvwxm5g5zrahg2a85"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/chromium-os/default.nix b/pkgs/os-specific/linux/chromium-os/default.nix index 5dbe9b17abc..cbe3c6ede1b 100644 --- a/pkgs/os-specific/linux/chromium-os/default.nix +++ b/pkgs/os-specific/linux/chromium-os/default.nix @@ -35,9 +35,18 @@ let linux = self.linux_4_19; - linuxHeaders = makeLinuxHeaders { + linuxHeaders = (makeLinuxHeaders { inherit (linux) version src; - }; + }).overrideAttrs ({ nativeBuildInputs, ... }: { + # makeLinuxHeaders is designed for Linux 5.5, which has a + # different header build system from 4.19, currently used by + # Chromium OS. When the Chromium OS kernel bumps to a new major + # version, try removing this override to see if it's still + # necessary. If it builds without it, the override can go. + buildPhase = '' + make headers_install $makeFlags + ''; + }); minigbm = callPackage ./minigbm { }; |