···

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
stdenv.mkDerivation rec {

     

       
19
       
19
       
 
       
  pname = "bear";

     

       
20
       
20
       
-
       
  version = "3.0.14";

     

       
20
       
20
       
+
       
  version = "3.0.19";

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
  src = fetchFromGitHub {

     

       
23
       
23
       
 
       
    owner = "rizsotto";

     

       
24
       
24
       
 
       
    repo = pname;

     

       
25
       
25
       
 
       
    rev = version;

     

       
26
       
26
       
-
       
    sha256 = "0qy96dyd29bjvfhi46y30hli5cvshw8am0spvcv9v43660wbczd7";

     

       
26
       
26
       
+
       
    sha256 = "sha256-Jj38dmzr8NDDMercfWyJrMFxGBSExCGPeG2IVEtnSxY=";

     

       
27
       
27
       
 
       
  };

     

       
28
       
28
       
 
       


     

       
29
       
29
       
 
       
  nativeBuildInputs = [ cmake pkg-config ];

     

···

       
1
       
1
       
-
       
diff --git i/source/config.h.in w/source/config.h.in

     

       
2
       
2
       
-
       
index ffcce3a..0caba6d 100644

     

       
3
       
3
       
-
       
--- i/source/config.h.in

     

       
4
       
4
       
-
       
+++ w/source/config.h.in

     

       
5
       
5
       
-
       
@@ -107,7 +107,7 @@ namespace cmd {

     

       
1
       
1
       
+
       
diff --git a/source/config.h.in b/source/config.h.in

     

       
2
       
2
       
+
       
index 6b659c2..f7bdf22 100644

     

       
3
       
3
       
+
       
--- a/source/config.h.in

     

       
4
       
4
       
+
       
+++ b/source/config.h.in

     

       
5
       
5
       
+
       
@@ -108,8 +108,8 @@ namespace cmd {

     

       
6
       
6
       
 
       
     }

     

       
7
       
7
       
 
       
 

     

       
8
       
8
       
 
       
     namespace wrapper {

     

       
9
       
9
       
-
       
-        constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper";

     

       
10
       
10
       
-
       
+        constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/wrapper";

     

       
11
       
11
       
-
       
         constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d";

     

       
9
       
9
       
+
       
-        constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper";

     

       
10
       
10
       
+
       
-        constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d";

     

       
11
       
11
       
+
       
+        constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper";

     

       
12
       
12
       
+
       
+        constexpr char DEFAULT_DIR_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d";

     

       
12
       
13
       
 
       
 

     

       
13
       
14
       
 
       
         constexpr char FLAG_VERBOSE[] = "--verbose";

     

       
14
       
14
       
-
       
@@ -120,7 +120,7 @@ namespace cmd {

     

       
15
       
15
       
-
       
     }

     

       
16
       
16
       
-
       
 

     

       
17
       
17
       
-
       
     namespace library {

     

       
18
       
18
       
-
       
-        constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";

     

       
19
       
19
       
-
       
+        constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";

     

       
20
       
20
       
-
       
 

     

       
15
       
15
       
+
       
         constexpr char FLAG_DESTINATION[] = "--destination";

     

       
16
       
16
       
+
       
@@ -134,9 +134,9 @@ namespace cmd {

     

       
17
       
17
       
+
       
         // And use the `libexec.so` path default value with a single path,

     

       
18
       
18
       
+
       
         // that matches both. (The match can be achieved by the $LIB token

     

       
19
       
19
       
+
       
         // expansion from the dynamic loader. See `man ld.so` for more.)

     

       
20
       
20
       
+
       
-        constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";

     

       
21
       
21
       
+
       
+        constexpr char DEFAULT_PATH[] = "$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";

     

       
22
       
22
       
+
       
 #else

     

       
23
       
23
       
+
       
-        constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";

     

       
24
       
24
       
+
       
+        constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";

     

       
25
       
25
       
+
       
 #endif

     

       
21
       
26
       
 
       
         constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND";

     

       
22
       
27
       
 
       
         constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION";