From f649c6c70544a8897a78d17c6a311796b32a3560 Mon Sep 17 00:00:00 2001 From: Alyssa Date: Thu, 18 Apr 2019 10:13:52 +0200 Subject: mesa: make X11-only dependencies conditional --- .../pkgs/development/libraries/mesa/default.nix | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix') diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 0a53ecaa2f61..c25c67a3f6e3 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -158,18 +158,22 @@ let self = stdenv.mkDerivation { python2 python2Packages.Mako ]; - propagatedBuildInputs = with xorg; [ - libXdamage libXxf86vm - ] ++ optional stdenv.isLinux libdrm + propagatedBuildInputs = + optionals (elem "x11" eglPlatforms) (with xorg; [ libXdamage libXxf86vm ]) + ++ optional stdenv.isLinux libdrm ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; - buildInputs = with xorg; [ - expat llvmPackages.llvm libglvnd xorgproto - libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr - libffi libvdpau libelf libXvMC - libpthreadstubs openssl /*or another sha1 provider*/ - ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ]; + buildInputs = [ expat llvmPackages.llvm libglvnd libelf ] + ++ optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] + ++ optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] + + ++ optionals (elem "x11" eglPlatforms) + ((with xorg; [ + xorgproto + libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr + libffi libvdpau libXvMC + libpthreadstubs openssl /*or another sha1 provider*/ + ]) ++ optional stdenv.isLinux valgrind-light); enableParallelBuilding = true; doCheck = false; -- cgit 1.4.1