diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-08 21:47:11 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-08 21:50:24 -0400 |
| commit | 476c580605c071cbadbd8715984b7da08f58d303 (patch) | |
| tree | 29c3b2d69264eaebe8f4ed42b046c7c1fbf7af6a /pkgs/development/libraries/mesa | |
| parent | 922589053724885437b2c75257ab36383f95c378 (diff) | |
| download | nixpkgs-476c580605c071cbadbd8715984b7da08f58d303.tar nixpkgs-476c580605c071cbadbd8715984b7da08f58d303.tar.gz nixpkgs-476c580605c071cbadbd8715984b7da08f58d303.tar.bz2 nixpkgs-476c580605c071cbadbd8715984b7da08f58d303.tar.lz nixpkgs-476c580605c071cbadbd8715984b7da08f58d303.tar.xz nixpkgs-476c580605c071cbadbd8715984b7da08f58d303.tar.zst nixpkgs-476c580605c071cbadbd8715984b7da08f58d303.zip | |
mesa: don’t use valgrind-light on aarch32
valgrind-light doesn’t appear to work correctly on aarch32. It’s also not a required dependency on mesa, so in the future we may be able to disable it for other platforms
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 05c5116a01d..79947ae2f15 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, python2Packages +, libelf, libvdpau, python2, python2Packages , libglvnd , enableRadv ? true , galliumDrivers ? null @@ -10,6 +10,7 @@ , vulkanDrivers ? null , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin +, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light }: /** Packaging design: @@ -146,7 +147,8 @@ let self = stdenv.mkDerivation { libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ]; + ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] + ++ lib.optional withValgrind valgrind-light; enableParallelBuilding = true; doCheck = false; |