diff options
Diffstat (limited to 'pkgs/development/libraries/mesa/default.nix')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index faf1261da4a5..9b496134774a 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 @@ -67,7 +67,7 @@ let in let - version = "18.2.6"; + version = "18.3.1"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "04nwxykmc80gicmal0zkk8is34rmbqawmfckirqhrps9h97zmfly"; + sha256 = "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv"; }; prePatch = "patchShebangs ."; @@ -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; [ @@ -146,10 +149,9 @@ let self = stdenv.mkDerivation { glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC - libpthreadstubs openssl/*or another sha1 provider*/ - valgrind-light python2 python2.pkgs.Mako + libpthreadstubs openssl /*or another sha1 provider*/ ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]; + ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ]; enableParallelBuilding = true; doCheck = false; @@ -161,7 +163,10 @@ let self = stdenv.mkDerivation { ]; # TODO: probably not all .la files are completely fixed, but it shouldn't matter; - postInstall = optionalString (galliumDrivers != []) '' + postInstall = '' + # Some installs don't have any drivers so this directory is never created. + mkdir -p $drivers + '' + optionalString (galliumDrivers != []) '' # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM mv -t "$drivers/lib/" \ $out/lib/libXvMC* \ |