various packages fixed

This commit is contained in:
Vladimír Čunát
2014-08-30 23:30:31 +02:00
parent d25cc03f21
commit 381dcb1d98
7 changed files with 36 additions and 20 deletions
+3 -3
View File
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
patch -R -p1 < ${./rtti.patch}
'';
outputs = ["out" "drivers" "osmesa"];
outputs = [ "dev" "out" "drivers" "osmesa" ];
configureFlags = [
"--with-dri-driverdir=$(drivers)/lib/dri"
@@ -113,8 +113,8 @@ stdenv.mkDerivation {
'' + optionalString enableExtraFeatures ''
`#$out/lib/libXvMC*` \
$out/lib/gbm $out/lib/libgbm* \
$out/lib/gallium-pipe \
'' + ''
$out/lib/gallium-pipe \
$out/lib/libdricore* \
$out/lib/libgallium* \
$out/lib/vdpau \
@@ -134,8 +134,8 @@ stdenv.mkDerivation {
sed "/^libdir=/s,$out,$drivers," -i \
'' + optionalString enableExtraFeatures ''
`#$drivers/lib/libXvMC*.la` \
$drivers/lib/gallium-pipe/*.la \
'' + ''
$drivers/lib/gallium-pipe/*.la \
$drivers/lib/libgallium.la \
$drivers/lib/vdpau/*.la \
$drivers/lib/libdricore*.la