diff options
Diffstat (limited to 'pkgs/development/libraries/cxxopts/fix-install-path.patch')
| -rw-r--r-- | pkgs/development/libraries/cxxopts/fix-install-path.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/libraries/cxxopts/fix-install-path.patch b/pkgs/development/libraries/cxxopts/fix-install-path.patch deleted file mode 100644 index d91e3fb6dc18f..0000000000000 --- a/pkgs/development/libraries/cxxopts/fix-install-path.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/cxxopts.cmake b/cmake/cxxopts.cmake -index 46e87ba..0ead543 100644 ---- a/cmake/cxxopts.cmake -+++ b/cmake/cxxopts.cmake -@@ -87,7 +87,12 @@ endfunction() - - # Helper function to ecapsulate install logic - function(cxxopts_install_logic) -- string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") -+ if(CMAKE_LIBRARY_ARCHITECTURE) -+ string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") -+ else() -+ # On some systems (e.g. NixOS), `CMAKE_LIBRARY_ARCHITECTURE` can be empty -+ set(CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") -+ endif() - set(CXXOPTS_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR_ARCHIND}/cmake/cxxopts" CACHE STRING "Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.") - set(version_config "${PROJECT_BINARY_DIR}/cxxopts-config-version.cmake") - set(project_config "${PROJECT_BINARY_DIR}/cxxopts-config.cmake") |