JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bear: 3.0.9 -> 3.0.12

Browse Source 
Fixes: https://github.com/NixOS/nixpkgs/pull/117413
This commit is contained in:
Alyssa Ross 2021-06-14 18:12:02 +00:00
parent 6aaabb89e2
commit 5d08999385
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/build-managers/bear/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bear"; pname = "bear";
version = "3.0.9"; version = "3.0.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rizsotto"; owner = "rizsotto";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "xac8PYo3qYjtQbDy8piOz5BQQpcVlAvMCv1qHrVZmPQ="; sha256 = "0nalvmkl9iwbs4wbsacryrwr46vk3x6jzqj9v5wfyf6aim3s1szs";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/rizsotto/Bear"; homepage = "https://github.com/rizsotto/Bear";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.babariviere ]; maintainers = with maintainers; [ babariviere qyliss ];
# ld: symbol(s) not found for architecture x86_64 # ld: symbol(s) not found for architecture x86_64
broken = stdenv.isDarwin; broken = stdenv.isDarwin;
}; };

34
pkgs/development/tools/build-managers/bear/no-double-relative.patch
View File

@ -1,14 +1,22 @@
diff --git a/source/config.h.in b/source/config.h.in diff --git i/source/config.h.in w/source/config.h.in
index 728c234..a3e76c6 100644 index ffcce3a..0caba6d 100644
--- a/source/config.h.in --- i/source/config.h.in
+++ b/source/config.h.in +++ w/source/config.h.in
@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; @@ -107,7 +107,7 @@ namespace cmd {
}
constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; namespace wrapper {
constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; - constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper";
-constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; + constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/wrapper";
-constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d";
-constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";
+constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; constexpr char FLAG_VERBOSE[] = "--verbose";
+constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; @@ -120,7 +120,7 @@ namespace cmd {
+constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; }
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 KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND";
constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION";