From 1f4c079bc3c7dd8951cebe7a347bf5d296cb2126 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Jun 2013 17:06:54 +0200 Subject: [PATCH] Re-propagate libdrm --- pkgs/development/libraries/mesa/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 6cfb4314e0a..de130d465c2 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -81,13 +81,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; - propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ]; + propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ] + ++ + stdenv.lib.optionals stdenv.isLinux [libdrm] + ; buildInputs = with xorg; [ autoconf automake libtool intltool expat libxml2Python llvm libXfixes glproto dri2proto libX11 libXext libxcb libXt libffi wayland ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ] - ++ stdenv.lib.optional stdenv.isLinux [libdrm udev] + ++ stdenv.lib.optional stdenv.isLinux [udev] ; enableParallelBuilding = true;