From e5d8381542a8d084371d26013fab199f52474be7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Jan 2020 22:33:16 +0000 Subject: sommelier: don't build demos Now we don't need to build half of Chromium OS just to use sommelier! It was in the runtime closure too. Made generating the squashfs's extremely slow. --- pkgs/os-specific/linux/chromium-os/sommelier/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/chromium-os/sommelier/default.nix') diff --git a/pkgs/os-specific/linux/chromium-os/sommelier/default.nix b/pkgs/os-specific/linux/chromium-os/sommelier/default.nix index 599c8dc7d3e..2a1790bfa6d 100644 --- a/pkgs/os-specific/linux/chromium-os/sommelier/default.nix +++ b/pkgs/os-specific/linux/chromium-os/sommelier/default.nix @@ -9,13 +9,16 @@ common-mk { platform2Patches = [ ./0008-sommelier-don-t-leak-source-absolute-paths.patch ./0009-sommelier-use-stable-xdg-shell-protocol.patch + ./0010-sommelier-make-building-demos-optional.patch ]; buildInputs = [ - mesa grpc openssl libdrm protobuf wayland libxkbcommon vm_protos libbrillo - libchrome linuxHeaders c-ares zlib + mesa grpc openssl libdrm protobuf wayland libxkbcommon vm_protos + linuxHeaders c-ares zlib ] ++ (with xlibs; [ pixman libxcb libX11 ]); + gnArgs.use_demos = false; + NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" "-Wno-error=stringop-truncation" @@ -25,7 +28,7 @@ common-mk { installPhase = '' mkdir -p $out/bin - install sommelier wayland_demo x11_demo $out/bin + install sommelier $out/bin ''; meta = with lib; { -- cgit 1.4.1