diff options
| author | Alyssa <hi@alyssa.is> | 2019-04-18 14:15:34 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-23 10:02:30 +0000 |
| commit | 15c2c4d52d75100a9dba3f12c7f6e90004e51ef2 (patch) | |
| tree | 1ba284d6aaa1fb358f13d218104fb1f05628321a /nixpkgs/pkgs/development/libraries/mesa/default.nix | |
| parent | dfdfaa2b4e97913327baadaf049b17686b0577d9 (diff) | |
| download | nixlib-15c2c4d52d75100a9dba3f12c7f6e90004e51ef2.tar nixlib-15c2c4d52d75100a9dba3f12c7f6e90004e51ef2.tar.gz nixlib-15c2c4d52d75100a9dba3f12c7f6e90004e51ef2.tar.bz2 nixlib-15c2c4d52d75100a9dba3f12c7f6e90004e51ef2.tar.lz nixlib-15c2c4d52d75100a9dba3f12c7f6e90004e51ef2.tar.xz nixlib-15c2c4d52d75100a9dba3f12c7f6e90004e51ef2.tar.zst nixlib-15c2c4d52d75100a9dba3f12c7f6e90004e51ef2.zip | |
mesa: make libelf support optional
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index db01a812200a..e628c636397e 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -2,7 +2,7 @@ , pkgconfig, intltool, autoreconfHook , file, expat, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi -, libelf, valgrind-light, python2, python2Packages +, valgrind-light, python2, python2Packages , libglvnd , enableRadv ? stdenv.isLinux , galliumDrivers ? null @@ -15,6 +15,7 @@ , omxBellagioSupport ? stdenv.isLinux, libomxil-bellagio , vaSupport ? stdenv.isLinux, libva-minimal , libdrmSupport ? stdenv.isLinux, libdrm +, libelfSupport ? stdenv.isLinux, libelf , OpenGL, Xplugin }: @@ -25,7 +26,7 @@ assert elem "drm" eglPlatforms -> libdrmSupport; assert elem "wayland" eglPlatforms -> libdrmSupport; assert xvmcSupport -> elem "x11" eglPlatforms; assert vdpauSupport -> elem "x11" eglPlatforms; -assert enableRadv -> libdrmSupport; +assert enableRadv -> libdrmSupport && libelfSupport; /** Packaging design: - The basic mesa ($out) contains headers and libraries (GLU is in libGLU now). @@ -196,7 +197,8 @@ let self = stdenv.mkDerivation { ++ optional libdrmSupport libdrm ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; - buildInputs = [ expat llvmPackages.llvm libglvnd libelf ] + buildInputs = [ expat llvmPackages.llvm libglvnd ] + ++ optional libelfSupport libelf ++ optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ++ optional xvmcSupport xorg.libXvMC ++ optional vdpauSupport libvdpau |