git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #106804: mesa: find prefixed nm when cross compiling
commite955c4315f577d084afc3d6a792371ce58397223 authorVladimír Čunát <v@cunat.cz> dateSun 13 Dec 2020, 11:06 (6 years ago) parent0e18a480169800
1 file changed+4
pkgs/development/libraries/mesa/default.nix+4
pkgs/development/libraries/mesa/default.nix+4
@@ -101,6 +101,10 @@ stdenv.mkDerivation {
101101 'DATADIR "/drirc.d"' '"${placeholder "out"}/drirc.d"'
102102 substituteInPlace src/util/meson.build --replace \
103103 "get_option('datadir')" "'${placeholder "out"}'"
104+ '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
105+ substituteInPlace meson.build --replace \
106+ "find_program('nm')" \
107+ "find_program('${stdenv.cc.targetPrefix}nm')"
104108 '';
105109
106110 outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa";