summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-05-25 11:50:41 +0000
committerAlyssa Ross <hi@alyssa.is>2023-06-01 12:49:55 +0000
commitfc4ffe5a7a07210c2b963f1d8a4abdcb6eb06428 (patch)
treee211fc174be43d86e91cf55ad47e3e563279d879
parent70c4a233a292ba9914072714c416c754c863b7b9 (diff)
downloadnixpkgs-fc4ffe5a7a07210c2b963f1d8a4abdcb6eb06428.tar
nixpkgs-fc4ffe5a7a07210c2b963f1d8a4abdcb6eb06428.tar.gz
nixpkgs-fc4ffe5a7a07210c2b963f1d8a4abdcb6eb06428.tar.bz2
nixpkgs-fc4ffe5a7a07210c2b963f1d8a4abdcb6eb06428.tar.lz
nixpkgs-fc4ffe5a7a07210c2b963f1d8a4abdcb6eb06428.tar.xz
nixpkgs-fc4ffe5a7a07210c2b963f1d8a4abdcb6eb06428.tar.zst
nixpkgs-fc4ffe5a7a07210c2b963f1d8a4abdcb6eb06428.zip
westonLite: disable JPEG and LCMS2 support
Neither of these features are so critical that the lite variant of the
package requires them.
-rw-r--r--pkgs/applications/window-managers/weston/default.nix14
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 86b9a84267c..fa240d18c96 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,10 +1,12 @@
 { lib, stdenv, fetchurl
 , meson, ninja, pkg-config, python3, wayland-scanner
-, cairo, dbus, lcms2, libdrm, libevdev, libinput, libjpeg, libxkbcommon, mesa
-, seatd, wayland, wayland-protocols, xcbutilcursor
+, cairo, dbus, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland
+, wayland-protocols, xcbutilcursor
 
 , demoSupport ? true
 , hdrSupport ? true, libdisplay-info
+, jpegSupport ? true, libjpeg
+, lcmsSupport ? true, lcms2
 , pangoSupport ? true, pango
 , pipewireSupport ? true, pipewire
 , rdpSupport ? true, freerdp
@@ -27,9 +29,11 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ];
   buildInputs = [
-    cairo lcms2 libdrm libevdev libinput libjpeg libxkbcommon mesa seatd
-    wayland wayland-protocols
+    cairo libdrm libevdev libinput libxkbcommon mesa seatd wayland
+    wayland-protocols
   ] ++ lib.optional hdrSupport libdisplay-info
+    ++ lib.optional jpegSupport libjpeg
+    ++ lib.optional lcmsSupport lcms2
     ++ lib.optional pangoSupport pango
     ++ lib.optional pipewireSupport pipewire
     ++ lib.optional rdpSupport freerdp
@@ -44,7 +48,9 @@ stdenv.mkDerivation rec {
     (lib.mesonBool "backend-pipewire" pipewireSupport)
     (lib.mesonBool "backend-rdp" rdpSupport)
     (lib.mesonBool "backend-vnc" vncSupport)
+    (lib.mesonBool "color-management-lcms" lcmsSupport)
     (lib.mesonBool "demo-clients" demoSupport)
+    (lib.mesonBool "image-jpeg" jpegSupport)
     (lib.mesonBool "image-webp" webpSupport)
     (lib.mesonBool "pipewire" pipewireSupport)
     (lib.mesonBool "remoting" remotingSupport)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d5a674fb8a..489dbf5a56f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35263,6 +35263,8 @@ with pkgs;
   westonLite = weston.override {
     demoSupport = false;
     hdrSupport = false;
+    jpegSupport = false;
+    lcmsSupport = false;
     pangoSupport = false;
     pipewireSupport = false;
     rdpSupport = false;