summary refs log tree commit diff
path: root/pkgs/os-specific/linux/chromium-os/sommelier/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-01-15 22:33:16 +0000
committerAlyssa Ross <hi@alyssa.is>2020-01-15 22:33:16 +0000
commite5d8381542a8d084371d26013fab199f52474be7 (patch)
tree3308ea33b75b082491335297bab88edb15e51dc7 /pkgs/os-specific/linux/chromium-os/sommelier/default.nix
parent58cd3af7350634890793f9df2c1b94249b2352d0 (diff)
downloadnixpkgs-e5d8381542a8d084371d26013fab199f52474be7.tar
nixpkgs-e5d8381542a8d084371d26013fab199f52474be7.tar.gz
nixpkgs-e5d8381542a8d084371d26013fab199f52474be7.tar.bz2
nixpkgs-e5d8381542a8d084371d26013fab199f52474be7.tar.lz
nixpkgs-e5d8381542a8d084371d26013fab199f52474be7.tar.xz
nixpkgs-e5d8381542a8d084371d26013fab199f52474be7.tar.zst
nixpkgs-e5d8381542a8d084371d26013fab199f52474be7.zip
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.
Diffstat (limited to 'pkgs/os-specific/linux/chromium-os/sommelier/default.nix')
-rw-r--r--pkgs/os-specific/linux/chromium-os/sommelier/default.nix9
1 files changed, 6 insertions, 3 deletions
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; {