diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-03-01 20:00:42 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-03-01 20:00:42 +0100 |
| commit | 810dd0f9844e56efec66bfbf82c5e0412acbcba7 (patch) | |
| tree | f2e15aca6ff36c67ba27642c111bc22b2e80ea95 /pkgs/development/tools/build-managers | |
| parent | 020e80104a4723260684c8e672ac3c5c973be88d (diff) | |
| parent | 6a5cc4f8cc34ff3cf455a8c4814e6433391bcc98 (diff) | |
| download | nixpkgs-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar nixpkgs-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.gz nixpkgs-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.bz2 nixpkgs-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.lz nixpkgs-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.xz nixpkgs-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.zst nixpkgs-810dd0f9844e56efec66bfbf82c5e0412acbcba7.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -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 ]; }; } |