fix LD_PRELOAD error for bear

+16 -2
+1
lib/maintainers.nix
··· 71 auntie = "Jonathan Glines <auntieNeo@gmail.com>"; 72 avnik = "Alexander V. Nikolaev <avn@avnik.info>"; 73 aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>"; 74 bachp = "Pascal Bach <pascal.bach@nextrem.ch>"; 75 backuitist = "Bruno Bieth"; 76 badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
··· 71 auntie = "Jonathan Glines <auntieNeo@gmail.com>"; 72 avnik = "Alexander V. Nikolaev <avn@avnik.info>"; 73 aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>"; 74 + babariviere = "Bastien Riviere <babariviere@protonmail.com>"; 75 bachp = "Pascal Bach <pascal.bach@nextrem.ch>"; 76 backuitist = "Bruno Bieth"; 77 badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
+13
pkgs/development/tools/build-managers/bear/cmakepaths.patch
···
··· 1 + diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index 04c5c58..429ca47 100644 3 + --- a/CMakeLists.txt 4 + +++ b/CMakeLists.txt 5 + @@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue") 6 + 7 + set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX}) 8 + set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear") 9 + -set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") 10 + +set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") 11 + 12 + add_subdirectory(libear) 13 + add_subdirectory(bear)
+2 -2
pkgs/development/tools/build-managers/bear/default.nix
··· 16 17 doCheck = false; # all fail 18 19 - patches = [ ./ignore_wrapper.patch ]; 20 21 meta = with stdenv.lib; { 22 description = "Tool that generates a compilation database for clang tooling"; ··· 28 homepage = https://github.com/rizsotto/Bear; 29 license = licenses.gpl3Plus; 30 platforms = platforms.unix; 31 - maintainers = [ maintainers.vcunat ]; 32 }; 33 }
··· 16 17 doCheck = false; # all fail 18 19 + patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ]; 20 21 meta = with stdenv.lib; { 22 description = "Tool that generates a compilation database for clang tooling"; ··· 28 homepage = https://github.com/rizsotto/Bear; 29 license = licenses.gpl3Plus; 30 platforms = platforms.unix; 31 + maintainers = [ maintainers.vcunat maintainers.babariviere ]; 32 }; 33 }