mesa: fixup with multiple outputs

This commit is contained in:
Vladimír Čunát 2015-10-04 09:52:46 +02:00
parent 2323d70d88
commit 7434b8c29f

View File

@ -125,29 +125,18 @@ stdenv.mkDerivation {
$out/lib/libXvMC* \ $out/lib/libXvMC* \
$out/lib/d3d \ $out/lib/d3d \
$out/lib/vdpau \ $out/lib/vdpau \
$out/lib/{bellagio,d3d} \
$out/lib/libxatracker* $out/lib/libxatracker*
mv -t "$drivers/lib/dri/" \ mkdir -p {$osmesa,$drivers}/lib/
"$out"/lib/dri/*
rmdir "$out/lib/dri"
mkdir -p {$osmesa,$drivers}/lib/pkgconfig
mv -t $osmesa/lib/ \ mv -t $osmesa/lib/ \
$out/lib/libOSMesa* $out/lib/libOSMesa*
mv -t $drivers/lib/pkgconfig/ \
$out/lib/pkgconfig/xatracker.pc
mv -t $osmesa/lib/pkgconfig/ \
$out/lib/pkgconfig/osmesa.pc
'' + /* now fix references in .la files */ '' '' + /* now fix references in .la files */ ''
sed "/^libdir=/s,$out,$osmesa," -i \ sed "/^libdir=/s,$out,$osmesa," -i \
$osmesa/lib/libOSMesa*.la $osmesa/lib/libOSMesa*.la
'' + /* set the default search path for DRI drivers; used e.g. by X server */ '' '' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
'' + /* move vdpau drivers to $drivers/lib, so they are found */ '' '' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
''; '';