mesa WIP: preferLocalBuild, hopefully work around

This commit is contained in:
Vladimír Čunát 2013-05-17 17:54:12 +02:00
parent 92da417fa4
commit 16b2e1b46f

View File

@ -49,6 +49,7 @@ stdenv.mkDerivation {
''; '';
outputs = ["out" "drivers"]; outputs = ["out" "drivers"];
preferLocalBuild = true; # see https://github.com/NixOS/nix/issues/118
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
@ -93,7 +94,6 @@ stdenv.mkDerivation {
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
# ToDo: probably not all .la files are completely fixed, but it shouldn't matter # ToDo: probably not all .la files are completely fixed, but it shouldn't matter
postInstall = '' postInstall = ''
# salt to restart hydra
mv -t "$drivers/lib/" \ mv -t "$drivers/lib/" \
$out/lib/libdricore* \ $out/lib/libdricore* \
$out/lib/libgallium.* \ $out/lib/libgallium.* \