public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: fix cross-compiling

This commit is contained in:
Jörg Thalheim 2018-12-12 01:10:30 +00:00
parent 054b938c5c
commit e873882849
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/mesa/default.nix
View File

@ -2,7 +2,7 @@
, pkgconfig, intltool, autoreconfHook , pkgconfig, intltool, autoreconfHook
, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, valgrind-light, python2 , libelf, libvdpau, valgrind-light, python2, python2Packages
, libglvnd , libglvnd
, enableRadv ? true , enableRadv ? true
, galliumDrivers ? null , galliumDrivers ? null
@ -134,11 +134,14 @@ let self = stdenv.mkDerivation {
"--disable-opencl" "--disable-opencl"
]; ];
nativeBuildInputs = [ autoreconfHook intltool pkgconfig file ]; nativeBuildInputs = [
autoreconfHook intltool pkgconfig file
python2 python2Packages.Mako
];
propagatedBuildInputs = with xorg; propagatedBuildInputs = with xorg; [
[ libXdamage libXxf86vm ] libXdamage libXxf86vm
++ optional stdenv.isLinux libdrm ] ++ optional stdenv.isLinux libdrm
++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; ++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
buildInputs = with xorg; [ buildInputs = with xorg; [
@ -147,7 +150,6 @@ let self = stdenv.mkDerivation {
libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
libffi libvdpau libelf libXvMC libffi libvdpau libelf libXvMC
libpthreadstubs openssl /*or another sha1 provider*/ libpthreadstubs openssl /*or another sha1 provider*/
python2 python2.pkgs.Mako
] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ]; ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ];