diff --git a/mesa.gni b/mesa.gni
index fefef06..e6948d0 100644
--- a/mesa.gni
+++ b/mesa.gni
@@ -114,6 +114,11 @@
            "${py_binary_target} should only have one output")
     py_binary = py_binary[0]
     sources = [ py_binary ]
+    if (defined(invoker.sources)) {
+      # invoker.sources needed here for scripts that import at runtime
+      # (eg brw_nir_trig_workarounds.py)
+      sources += invoker.sources
+    }
 
     # Ensure scripts can import other scripts in the same directory
     # Note - I'm not sure why the ../ is necessary.
diff --git a/src/intel/compiler/BUILD.gn b/src/intel/compiler/BUILD.gn
index 2b84504..def1ade 100644
--- a/src/intel/compiler/BUILD.gn
+++ b/src/intel/compiler/BUILD.gn
@@ -183,6 +183,6 @@
   libraries = [ "//third_party/mako" ]
   args = [
     "--import-path",
-    "$magma_python_path:" + rebase_path("$mesa_build_root/src/compiler/nir"),
+    rebase_path("$mesa_build_root/src/compiler/nir"),
   ]
 }