diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-06-14 07:46:33 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-06-14 07:46:33 +0400 |
| commit | 7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67 (patch) | |
| tree | 70bf81abf1f6a73600e7f3332b62b44f6b6421c5 /pkgs/development/libraries | |
| parent | 1a41887398e51f11c06deba0eb5ed3ca4b76eff1 (diff) | |
| download | nixpkgs-7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67.tar nixpkgs-7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67.tar.gz nixpkgs-7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67.tar.bz2 nixpkgs-7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67.tar.lz nixpkgs-7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67.tar.xz nixpkgs-7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67.tar.zst nixpkgs-7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67.zip | |
Some fixes
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1fca905cf55..6cfb4314e0a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -81,12 +81,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; - propagatedBuildInputs = with xorg; [ libdrm libXdamage libXxf86vm ]; + propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ]; buildInputs = with xorg; [ - autoconf automake libtool intltool expat libxml2Python udev llvm + autoconf automake libtool intltool expat libxml2Python llvm libXfixes glproto dri2proto libX11 libXext libxcb libXt libffi wayland - ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]; + ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ] + ++ stdenv.lib.optional stdenv.isLinux [libdrm udev] + ; enableParallelBuilding = true; doCheck = true; |