alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #36178 from babariviere/master

Browse source 
bear: fix LD_PRELOAD error
This commit is contained in:
Will Dietz 2018-03-01 11:44:53 -06:00 committed by GitHub
parent d482caf1bf 6967498370
commit 6a5cc4f8cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/maintainers.nix
View file

@ -71,6 +71,7 @@
auntie = "Jonathan Glines <auntieNeo@gmail.com>";
avnik = "Alexander V. Nikolaev <avn@avnik.info>";
aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
babariviere = "Bastien Riviere <babariviere@protonmail.com>";
bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
backuitist = "Bruno Bieth";
badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";

13
pkgs/development/tools/build-managers/bear/cmakepaths.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04c5c58..429ca47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue")
set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX})
set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear")
-set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.")
+set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.")
add_subdirectory(libear)
add_subdirectory(bear)

4
pkgs/development/tools/build-managers/bear/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = false; # all fail
patches = [ ./ignore_wrapper.patch ];
patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ];
meta = with stdenv.lib; {
description = "Tool that generates a compilation database for clang tooling";
@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/rizsotto/Bear;
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = [ maintainers.vcunat ];
maintainers = [ maintainers.vcunat maintainers.babariviere ];
};
}