diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-20 21:14:44 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-23 10:08:45 +0000 |
| commit | 6d4718efa23ee1304597403e93678affda398a04 (patch) | |
| tree | 68188c70c9ddbb9c6aaaafbd3ee01b3fdef081eb /nixpkgs/pkgs/development/libraries/mesa/default.nix | |
| parent | 632ccd74acfb1b2bf5f9544d29524ffe15483aff (diff) | |
| download | nixlib-6d4718efa23ee1304597403e93678affda398a04.tar nixlib-6d4718efa23ee1304597403e93678affda398a04.tar.gz nixlib-6d4718efa23ee1304597403e93678affda398a04.tar.bz2 nixlib-6d4718efa23ee1304597403e93678affda398a04.tar.lz nixlib-6d4718efa23ee1304597403e93678affda398a04.tar.xz nixlib-6d4718efa23ee1304597403e93678affda398a04.tar.zst nixlib-6d4718efa23ee1304597403e93678affda398a04.zip | |
mesa: only include X libraries as required
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 4be9fbd83d02..2c9f1f3570b8 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -212,10 +212,13 @@ let self = stdenv.mkDerivation { ++ optional valgrindSupport valgrind-light ++ optionals (elem "x11" eglPlatforms) - (with xorg; [ - xorgproto - libX11 libXext libxcb libxshmfence libXrandr - ]); + ((with xorg; [ xorgproto libX11 ])) + + ++ optionals (elem "x11" eglPlatforms && libdrmSupport) + (with xorg; [ libXext libxcb libxshmfence ]) + + ++ optional (elem "x11" eglPlatforms && elem "drm" eglPlatforms) + xorg.libXrandr; enableParallelBuilding = true; doCheck = false; |