public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-15 18:30:31 +00:00
committed by GitHub
parent d151b2fb41 f1b78f8618
commit c10600230e
49 changed files with 932 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch
View File

@@ -19,7 +19,7 @@ index 35a48c6af29c..e4300f256091 100644
# Install in Clang resource directory.
install(FILES ${file_name}
- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}
COMPONENT ${component})
add_dependencies(${component} ${target_name})

2
pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch
View File

@@ -19,7 +19,7 @@ index 7c127a93dfa7..6a95a65b70a7 100644
# Install in Clang resource directory.
install(FILES ${file_name}
- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}
COMPONENT ${component})
add_dependencies(${component} ${target_name})

2
pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch
View File

@@ -19,7 +19,7 @@ index 361538a58e47..f0d8d9ab80f1 100644
# Install in Clang resource directory.
install(FILES ${file_name}
- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}
COMPONENT ${component})
add_dependencies(${component} ${target_name})