diff options
| author | Emily | 2024-07-27 20:58:22 +0100 |
|---|---|---|
| committer | GitHub | 2024-07-27 20:58:22 +0100 |
| commit | 8ac24638b14cf9a238da397d1018a5d669dc1fd8 (patch) | |
| tree | 226ef96ee609d76955f862c1a8d366d6600936b7 /pkgs/by-name/me/meson | |
| parent | 066521b9bcec23ca6cfbf18da3099886d8c7390a (diff) | |
| parent | 8c9c8ade2f88a85ccdd4858cc802d7b7d6c48fe0 (diff) | |
Merge pull request #318226 from paparodeo/cmake-cc-full-path
cmake: fix strictDeps
Diffstat (limited to 'pkgs/by-name/me/meson')
| -rw-r--r-- | pkgs/by-name/me/meson/000-nixpkgs-cmake-prefix-path.patch | 12 | ||||
| -rw-r--r-- | pkgs/by-name/me/meson/package.nix | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/by-name/me/meson/000-nixpkgs-cmake-prefix-path.patch b/pkgs/by-name/me/meson/000-nixpkgs-cmake-prefix-path.patch new file mode 100644 index 000000000000..c45106c4f9d1 --- /dev/null +++ b/pkgs/by-name/me/meson/000-nixpkgs-cmake-prefix-path.patch @@ -0,0 +1,12 @@ +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}) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 962c80489c66..79ffae36a98f 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -31,6 +31,9 @@ python3.pkgs.buildPythonApplication rec { }; patches = [ + # Nixpkgs cmake uses NIXPKGS_CMAKE_PREFIX_PATH for the search path + ./000-nixpkgs-cmake-prefix-path.patch + # In typical distributions, RPATH is only needed for internal libraries so # meson removes everything else. With Nix, the locations of libraries # are not as predictable, therefore we need to keep them in the RPATH. |