diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-12 01:10:30 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-12-12 08:02:19 +0000 |
| commit | e8738828493a87c389d5ff2d103e1e3c53944fad (patch) | |
| tree | e499d34128975d27ce4cd458ac26cf7b92a0fbbe /pkgs/development/libraries/mesa | |
| parent | 054b938c5cd7e675c5526eaf888845e721286aea (diff) | |
| download | nixlib-e8738828493a87c389d5ff2d103e1e3c53944fad.tar nixlib-e8738828493a87c389d5ff2d103e1e3c53944fad.tar.gz nixlib-e8738828493a87c389d5ff2d103e1e3c53944fad.tar.bz2 nixlib-e8738828493a87c389d5ff2d103e1e3c53944fad.tar.lz nixlib-e8738828493a87c389d5ff2d103e1e3c53944fad.tar.xz nixlib-e8738828493a87c389d5ff2d103e1e3c53944fad.tar.zst nixlib-e8738828493a87c389d5ff2d103e1e3c53944fad.zip | |
mesa: fix cross-compiling
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ede4dd889e58..700542c6e896 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -2,7 +2,7 @@ , pkgconfig, intltool, autoreconfHook , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau, valgrind-light, python2 +, libelf, libvdpau, valgrind-light, python2, python2Packages , libglvnd , enableRadv ? true , galliumDrivers ? null @@ -134,11 +134,14 @@ let self = stdenv.mkDerivation { "--disable-opencl" ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig file ]; + nativeBuildInputs = [ + autoreconfHook intltool pkgconfig file + python2 python2Packages.Mako + ]; - propagatedBuildInputs = with xorg; - [ libXdamage libXxf86vm ] - ++ optional stdenv.isLinux libdrm + propagatedBuildInputs = with xorg; [ + libXdamage libXxf86vm + ] ++ optional stdenv.isLinux libdrm ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; buildInputs = with xorg; [ @@ -147,7 +150,6 @@ let self = stdenv.mkDerivation { libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ - python2 python2.pkgs.Mako ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ]; |