summary refs log tree commit diff
path: root/pkgs/os-specific/linux/chromium-os
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-07-28 13:44:21 +0000
committerAlyssa Ross <hi@alyssa.is>2021-07-28 17:46:39 +0000
commitcab13e087c80c4e7476bb7df432e2b7deb56563d (patch)
treef8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/os-specific/linux/chromium-os
parentd9c82ed3044c72cecf01c6ea042489d30914577c (diff)
parent8ecc61c91a596df7d3293603a9c2384190c1b89a (diff)
downloadnixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts:
	pkgs/applications/graphics/hello-wayland/default.nix
	pkgs/applications/virtualization/cloud-hypervisor/default.nix
	pkgs/applications/window-managers/tinywl/default.nix
	pkgs/applications/window-managers/wayfire/applications.nix
	pkgs/applications/window-managers/wayfire/default.nix
	pkgs/applications/window-managers/wayfire/wcm.nix
	pkgs/applications/window-managers/wayfire/wf-config.nix
	pkgs/applications/window-managers/wayfire/wf-shell.nix
	pkgs/development/libraries/wlroots/default.nix
	pkgs/os-specific/linux/chromium-os/crosvm/default.nix
	pkgs/os-specific/linux/kernel/common-config.nix
	pkgs/os-specific/linux/kernel/patches.nix
	pkgs/os-specific/linux/mdevd/default.nix
	pkgs/os-specific/linux/s6-linux-init/default.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/chromium-os')
-rw-r--r--pkgs/os-specific/linux/chromium-os/crosvm/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix
index f8b6b13e694..25fa4e2d937 100644
--- a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix
+++ b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, rustPlatform, fetchFromGitiles, upstreamInfo
-, pkgconfig, minigbm, minijail, wayland, wayland-protocols, dtc, libusb1, libcap
-, linux
+, pkg-config, minigbm, minijail, wayland, wayland-protocols, dtc, libusb1
+, libcap, linux
 }:
 
 let
@@ -45,9 +45,9 @@ in
       ./VIRTIO_NET_F_MAC.patch
     ];
 
-    cargoSha256 = "1hw9r7vggvn8p0sy4k0i2ijpyk0yb11qww6s6d6wdfvrl1ksbapl";
+    cargoSha256 = "1yhxw19niqwipi1fbrskrpvhs915lrs8sdcpknmqd9izq67r3a06";
 
-    nativeBuildInputs = [ pkgconfig wayland ];
+    nativeBuildInputs = [ pkg-config wayland ];
 
     buildInputs = [ dtc libcap libusb1 minigbm minijail wayland wayland-protocols ];
 
@@ -67,7 +67,7 @@ in
 
     CROSVM_CARGO_TEST_KERNEL_BINARY =
       lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform)
-        "${linux}/${stdenv.hostPlatform.platform.kernelTarget}";
+        "${linux}/${stdenv.hostPlatform.linux-kernel.target}";
 
     passthru = {
       inherit srcs;