mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-15 22:36:23 +01:00
f9a7cf528b
nixpkgs cmake uses NIXPKGS_CMAKE_PREFIX_PATH rather than CMAKE_PREFIX_PATH env to specify module search paths. Add the env variable to meson to allow finding modules via cmake to work.
12 lines
699 B
Diff
12 lines
699 B
Diff
diff --git a/mesonbuild/dependencies/data/CMakePathInfo.txt b/mesonbuild/dependencies/data/CMakePathInfo.txt
|
|
index 662ec58..4d5f4e4 100644
|
|
--- a/mesonbuild/dependencies/data/CMakePathInfo.txt
|
|
+++ b/mesonbuild/dependencies/data/CMakePathInfo.txt
|
|
@@ -5,6 +5,7 @@ list(APPEND TMP_PATHS_LIST ${CMAKE_PREFIX_PATH})
|
|
list(APPEND TMP_PATHS_LIST ${CMAKE_FRAMEWORK_PATH})
|
|
list(APPEND TMP_PATHS_LIST ${CMAKE_APPBUNDLE_PATH})
|
|
list(APPEND TMP_PATHS_LIST $ENV{CMAKE_PREFIX_PATH})
|
|
+list(APPEND TMP_PATHS_LIST $ENV{NIXPKGS_CMAKE_PREFIX_PATH})
|
|
list(APPEND TMP_PATHS_LIST $ENV{CMAKE_FRAMEWORK_PATH})
|
|
list(APPEND TMP_PATHS_LIST $ENV{CMAKE_APPBUNDLE_PATH})
|
|
list(APPEND TMP_PATHS_LIST ${CMAKE_SYSTEM_PREFIX_PATH})
|