From 1e51762cb0813f30529dad4d01157124d0773a16 Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Thu, 28 Jan 2021 17:05:48 -0500 Subject: [PATCH] opengl: Config option now specifies drivers output --- pkgs/opengl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/opengl/default.nix b/pkgs/opengl/default.nix index 3fb0bc5..2f99e85 100644 --- a/pkgs/opengl/default.nix +++ b/pkgs/opengl/default.nix @@ -51,6 +51,10 @@ in { "-Dgallium-nine=false" ]; + preInstall = '' + mkdir -p $out/share + '' + attrs.preInstall or ""; + postInstall = '' # move drivers (just vulkan in our case and doesn't avoid LLVM) mkdir -p $drivers/lib @@ -60,9 +64,6 @@ in { mkdir -p $osmesa/lib mv -t $osmesa/lib/ $out/lib/libOSMesa* - # move vendor files - mv $out/share/ $drivers/ - # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) for js in $drivers/share/vulkan/icd.d/*.json; do