diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-18 19:02:09 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-18 19:02:09 -0600 |
| commit | 2c1d3a9a824938e37a1a67f7532ac6f417f917c2 (patch) | |
| tree | b16b4cdf7c63b21f6ecbc6b04fcadd54b546d829 /pkgs/development/libraries/mesa | |
| parent | e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3 (diff) | |
| parent | 0925c482c8378e8a6a8724edc6596ea60f90a113 (diff) | |
| download | nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.gz nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.bz2 nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.lz nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.xz nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.zst nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9490e5537210..a6b935fb826e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -148,8 +148,8 @@ let self = stdenv.mkDerivation { libffi libvdpau libelf libXvMC libpthreadstubs openssl/*or another sha1 provider*/ valgrind-light python2 python2.pkgs.Mako - ] ++ lib.optionals stdenv.isLinux [ wayland wayland-protocols - libomxil-bellagio libva-minimal ]; + ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] + ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]; enableParallelBuilding = true; doCheck = false; |