summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-05-17 17:54:12 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-05-17 17:54:12 +0200
commit16b2e1b46f0bb72ba82668ec2e307d80e2937798 (patch)
treefc15557a9254cb2af574de25e99ae67b1c945377 /pkgs
parent92da417fa4364349daf27d46ca4a0419d36c0fe6 (diff)
downloadnixpkgs-16b2e1b46f0bb72ba82668ec2e307d80e2937798.tar
nixpkgs-16b2e1b46f0bb72ba82668ec2e307d80e2937798.tar.gz
nixpkgs-16b2e1b46f0bb72ba82668ec2e307d80e2937798.tar.bz2
nixpkgs-16b2e1b46f0bb72ba82668ec2e307d80e2937798.tar.lz
nixpkgs-16b2e1b46f0bb72ba82668ec2e307d80e2937798.tar.xz
nixpkgs-16b2e1b46f0bb72ba82668ec2e307d80e2937798.tar.zst
nixpkgs-16b2e1b46f0bb72ba82668ec2e307d80e2937798.zip
mesa WIP: preferLocalBuild, hopefully work around
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/mesa/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f3038f2d229..6c2415b5d10 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation {
   '';
 
   outputs = ["out" "drivers"];
+  preferLocalBuild = true; # see https://github.com/NixOS/nix/issues/118
 
   preConfigure = "./autogen.sh";
 
@@ -93,7 +94,6 @@ stdenv.mkDerivation {
   # 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
   postInstall = ''
-      # salt to restart hydra
     mv -t "$drivers/lib/" \
       $out/lib/libdricore* \
       $out/lib/libgallium.* \