public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89657 from primeos/mesa-DriConf-fix 

mesa: Set datadir so that the path to the DriConf defaults is correct
This commit is contained in:
Michael Weiss 2020-08-15 22:36:42 +02:00 committed by GitHub
parent cfe6081cee cd41673813
commit dfbda2135c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/mesa/default.nix
View File

@ -97,6 +97,12 @@ stdenv.mkDerivation {
substituteInPlace meson.build --replace \ substituteInPlace meson.build --replace \
"find_program('pkg-config')" \ "find_program('pkg-config')" \
"find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')" "find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')"
# The drirc.d directory cannot be installed to $drivers as that would cause a cyclic dependency:
substituteInPlace src/util/xmlconfig.c --replace \
'DATADIR "/drirc.d"' '"${placeholder "out"}/drirc.d"'
substituteInPlace src/util/meson.build --replace \
"get_option('datadir')" "'${placeholder "out"}'"
''; '';
outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa"; outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa";
@ -104,6 +110,7 @@ stdenv.mkDerivation {
# TODO: Figure out how to enable opencl without having a runtime dependency on clang # TODO: Figure out how to enable opencl without having a runtime dependency on clang
mesonFlags = [ mesonFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--datadir=${placeholder "drivers"}/share" # Vendor files
# Don't build in debug mode # Don't build in debug mode
# https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327 # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327
@ -184,9 +191,6 @@ stdenv.mkDerivation {
mv $out/lib/lib*_mesa* $drivers/lib mv $out/lib/lib*_mesa* $drivers/lib
fi fi
# move vendor files
mv $out/share/ $drivers/
# Update search path used by glvnd # Update search path used by glvnd
for js in $drivers/share/glvnd/egl_vendor.d/*.json; do for js in $drivers/share/glvnd/egl_vendor.d/*.json; do
substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_"