diff --git a/cargo_wrapper.py b/cargo_wrapper.py index 0b7353c2..183ffcd1 100644 --- a/cargo_wrapper.py +++ b/cargo_wrapper.py @@ -89,6 +89,9 @@ if __name__ == "__main__": pkg_config_path.append(str(opts.root_dir / 'meson-uninstalled')) env['PKG_CONFIG_PATH'] = os.pathsep.join(pkg_config_path) + if 'NASM' in env: + env['PATH'] = os.pathsep.join([os.path.dirname(env['NASM']), env['PATH']]) + rustc_target = None if 'RUSTC' in env: rustc_cmdline = shlex.split(env['RUSTC']) diff --git a/meson.build b/meson.build index 42a23358..163f655f 100644 --- a/meson.build +++ b/meson.build @@ -340,8 +340,12 @@ if get_option('gtk4').allowed() endif endif -if get_option('rav1e').allowed() and find_program('nasm', required: false).found() - features += 'gst-plugin-rav1e/asm' +if get_option('rav1e').allowed() + nasm = find_program('nasm', required: false) + if nasm.found() + features += 'gst-plugin-rav1e/asm' + extra_env += {'NASM': nasm.full_path()} + endif endif if get_option('default_library') == 'static'