From af428afe37236c9db0f0d2e9a56bf747530bbdb2 Mon Sep 17 00:00:00 2001 From: ash lea Date: Fri, 23 Jul 2021 14:24:41 -0700 Subject: [PATCH] mesa: fix datadir location (cherry picked from commit 9bf469e6488b5835ac83ccc5ca7f7f63c1f7a0dd) --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2eccde09d8b..35a279865cc 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -78,9 +78,9 @@ self = stdenv.mkDerivation { # 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"' + 'DATADIR "/drirc.d"' '"${placeholder "out"}/share/drirc.d"' substituteInPlace src/util/meson.build --replace \ - "get_option('datadir')" "'${placeholder "out"}'" + "get_option('datadir')" "'${placeholder "out"}/share'" '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace meson.build --replace \ "find_program('nm')" \