summary refs log tree commit diff
path: root/pkgs/development/libraries/mesa
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-01-05 10:15:00 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-01-05 10:15:00 +0100
commit60a3973a55f0574bf3f11303cb1dbc20a8bb6d70 (patch)
tree2040f2d41050694da9b2431eb1b7adc8719a425c /pkgs/development/libraries/mesa
parentaca57f1aed4068ee374d51b211844972dcb0192f (diff)
parentd9707792b5e1af8999ddcb790b8b1b06305dd186 (diff)
downloadnixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar
nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.gz
nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.bz2
nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.lz
nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.xz
nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.zst
nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/mesa')
-rw-r--r--pkgs/development/libraries/mesa/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index d7e05c9e9fb..e54df3562da 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -162,7 +162,10 @@ let self = stdenv.mkDerivation {
   ];
 
   # TODO: probably not all .la files are completely fixed, but it shouldn't matter;
-  postInstall = optionalString (galliumDrivers != []) ''
+  postInstall = ''
+    # Some installs don't have any drivers so this directory is never created.
+    mkdir -p $drivers
+  '' + optionalString (galliumDrivers != []) ''
     # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
     mv -t "$drivers/lib/"    \
       $out/lib/libXvMC*      \