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

Merge pull request #177110 from newAM/bear

Browse source 
bear: 3.0.14 -> 3.0.19
This commit is contained in:
Sandro 2022-07-17 15:14:13 +02:00 committed by GitHub
parent 9fd4a80e2a 18155c86ce
commit f13f81af88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "bear";
version = "3.0.14";
version = "3.0.19";
src = fetchFromGitHub {
owner = "rizsotto";
repo = pname;
rev = version;
sha256 = "0qy96dyd29bjvfhi46y30hli5cvshw8am0spvcv9v43660wbczd7";
sha256 = "sha256-Jj38dmzr8NDDMercfWyJrMFxGBSExCGPeG2IVEtnSxY=";
};
nativeBuildInputs = [ cmake pkg-config ];

35
pkgs/development/tools/build-managers/bear/no-double-relative.patch
View file

@ -1,22 +1,27 @@
diff --git i/source/config.h.in w/source/config.h.in
index ffcce3a..0caba6d 100644
--- i/source/config.h.in
+++ w/source/config.h.in
@@ -107,7 +107,7 @@ namespace cmd {
diff --git a/source/config.h.in b/source/config.h.in
index 6b659c2..f7bdf22 100644
--- a/source/config.h.in
+++ b/source/config.h.in
@@ -108,8 +108,8 @@ namespace cmd {
}
namespace wrapper {
- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper";
+ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/wrapper";
constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d";
- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper";
- constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d";
+ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper";
+ constexpr char DEFAULT_DIR_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d";
constexpr char FLAG_VERBOSE[] = "--verbose";
@@ -120,7 +120,7 @@ namespace cmd {
}
namespace library {
- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
+ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
constexpr char FLAG_DESTINATION[] = "--destination";
@@ -134,9 +134,9 @@ namespace cmd {
// And use the `libexec.so` path default value with a single path,
// that matches both. (The match can be achieved by the $LIB token
// expansion from the dynamic loader. See `man ld.so` for more.)
- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
+ constexpr char DEFAULT_PATH[] = "$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
#else
- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
+ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
#endif
constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND";
constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION";