diff options
| author | babariviere <babariviere@protonmail.com> | 2018-03-01 18:03:42 +0100 |
|---|---|---|
| committer | babariviere <babariviere@protonmail.com> | 2018-03-01 18:14:24 +0100 |
| commit | 6967498370791ef38ec4d8d5c19b3b744ae28882 (patch) | |
| tree | 4d9152daec97071e155db86d3a7fbaa4039a11c4 /pkgs | |
| parent | 8d3aa2f2b9e9ce8bb3e24468023af298fd72cdbb (diff) | |
| download | nixpkgs-6967498370791ef38ec4d8d5c19b3b744ae28882.tar nixpkgs-6967498370791ef38ec4d8d5c19b3b744ae28882.tar.gz nixpkgs-6967498370791ef38ec4d8d5c19b3b744ae28882.tar.bz2 nixpkgs-6967498370791ef38ec4d8d5c19b3b744ae28882.tar.lz nixpkgs-6967498370791ef38ec4d8d5c19b3b744ae28882.tar.xz nixpkgs-6967498370791ef38ec4d8d5c19b3b744ae28882.tar.zst nixpkgs-6967498370791ef38ec4d8d5c19b3b744ae28882.zip | |
fix LD_PRELOAD error for bear
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/bear/cmakepaths.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/bear/default.nix | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/pkgs/development/tools/build-managers/bear/cmakepaths.patch new file mode 100644 index 00000000000..d237267078e --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/cmakepaths.patch @@ -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) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 6afec72de5f..8f352f84b22 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -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 ]; }; } |