From 06510fab8c8bf0b597908b5fb800ba91f2480868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 Jul 2015 11:44:55 +0200 Subject: [PATCH] mesa: get rid of llvm dependency in $out, /cc #8990 - libXvMC* should be found fine in $drivers - for d3d state tracker, I don't know how it works, but it's a non-critical thing and maybe no nixers use it yet --- pkgs/development/libraries/mesa/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9d7fa4ae406..c30ef49268f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -4,7 +4,6 @@ , libvdpau, libelf, libva , grsecEnabled , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt -, enableExtraFeatures ? false # not maintained }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then @@ -123,10 +122,8 @@ stdenv.mkDerivation { # ToDo: probably not all .la files are completely fixed, but it shouldn't matter postInstall = with stdenv.lib; '' mv -t "$drivers/lib/" \ - '' + optionalString enableExtraFeatures '' - `#$out/lib/libXvMC*` \ - $out/lib/gbm $out/lib/libgbm* \ - '' + '' + $out/lib/libXvMC* \ + $out/lib/d3d \ $out/lib/vdpau \ $out/lib/libxatracker*