commit 2f24ff28a71c6a28c979e3bb430735455feca476 · pyrox.dev/nixpkgs

+35 -4

pkgs/development/tools/build-managers/bear/default.nix

···

       2
       2
        
       , fetchFromGitHub

     

       3
       3
        
       , fetchpatch

     

       4
       4
        
       , cmake

     

       5
       5
       +
       , ninja

     

       5
       6
        
       , pkg-config

     

       6
       7
        
       , grpc

     

       7
       8
        
       , protobuf

     
···

       13
       14
        
       , zlib

     

       14
       15
        
       , sqlite

     

       15
       16
        
       , re2

     

       17
       17
       +
       , lit

     

       18
       18
       +
       , python3

     

       19
       19
       +
       , coreutils

     

       16
       20
        
       }:

     

       17
       21
        
       

     

       18
       22
        
       stdenv.mkDerivation rec {

     
···

       26
       30
        
           hash = "sha256-1nZPzgLWcmaRkOUXdm16IW2Nw/p1w8GBGEfZX/v+En0=";

     

       27
       31
        
         };

     

       28
       32
        
       

     

       29
       29
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       33
       33
       +
         nativeBuildInputs = [

     

       34
       34
       +
           cmake

     

       35
       35
       +
           ninja

     

       36
       36
       +
           pkg-config

     

       37
       37
       +
       

     

       38
       38
       +
           # Used for functional tests, which run during buildPhase.

     

       39
       39
       +
           lit

     

       40
       40
       +
           python3

     

       41
       41
       +
         ];

     

       30
       42
        
       

     

       31
       43
        
         buildInputs = [

     

       32
       44
        
           grpc

     
···

       41
       53
        
           re2

     

       42
       54
        
         ];

     

       43
       55
        
       

     

       56
       56
       +
         cmakeFlags = [

     

       57
       57
       +
           # Build system and generated files concatenate install prefix and

     

       58
       58
       +
           # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths.

     

       59
       59
       +
           "-DCMAKE_INSTALL_BINDIR=bin"

     

       60
       60
       +
           "-DCMAKE_INSTALL_LIBDIR=lib"

     

       61
       61
       +
           (lib.cmakeBool "ENABLE_UNIT_TESTS" false)

     

       62
       62
       +
           (lib.cmakeBool "ENABLE_FUNC_TESTS" false)

     

       63
       63
       +
         ];

     

       64
       64
       +
       

     

       44
       65
        
         patches = [

     

       45
       45
       -
           # Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/...

     

       46
       46
       -
           ./no-double-relative.patch

     

       66
       66
       +
           # Fix toolchain environment variable handling and the Darwin SIP check.

     

       67
       67
       +
           ./fix-functional-tests.patch

     

       47
       68
        
         ];

     

       48
       69
        
       

     

       70
       70
       +
         postPatch = ''

     

       71
       71
       +
           patchShebangs test/bin

     

       72
       72
       +
       

     

       73
       73
       +
           # /usr/bin/env is used in test commands and embedded scripts.

     

       74
       74
       +
           find test -name '*.sh' \

     

       75
       75
       +
             -exec sed -ie 's|/usr/bin/env|${coreutils}/bin/env|g' {} +

     

       76
       76
       +
         '';

     

       77
       77
       +
       

     

       78
       78
       +
         # Functional tests use loopback networking.

     

       79
       79
       +
         __darwinAllowLocalNetworking = true;

     

       80
       80
       +
       

     

       49
       81
        
         meta = with lib; {

     

       50
       50
       -
           broken = stdenv.isDarwin;

     

       51
       82
        
           description = "Tool that generates a compilation database for clang tooling";

     

       52
       83
        
           longDescription = ''

     

       53
       84
        
             Note: the bear command is very useful to generate compilation commands

+32

pkgs/development/tools/build-managers/bear/fix-functional-tests.patch

···

       1
       1
       +
       diff --git a/test/lit.cfg b/test/lit.cfg

     

       2
       2
       +
       index 118c979..b69fecc 100644

     

       3
       3
       +
       --- a/test/lit.cfg

     

       4
       4
       +
       +++ b/test/lit.cfg

     

       5
       5
       +
       @@ -207,13 +207,8 @@ def is_preload_disabled():

     

       6
       6
       +
            if is_windows:

     

       7
       7
       +
                return True

     

       8
       8
       +
            elif sys.platform == 'darwin':

     

       9
       9
       +
       -        command = ['csrutil', 'status']

     

       10
       10
       +
       -        pattern = re.compile(r'System Integrity Protection status:\s+enabled')

     

       11
       11
       +
       -        try:

     

       12
       12
       +
       -            output = subprocess.check_output(command, stderr=subprocess.STDOUT)

     

       13
       13
       +
       -            return any(pattern.match(line) for line in output.decode('utf-8').splitlines())

     

       14
       14
       +
       -        except (OSError, subprocess.CalledProcessError):

     

       15
       15
       +
       -            return False

     

       16
       16
       +
       +        # csrutil(8) isn't available in the Nix build sandbox.

     

       17
       17
       +
       +        return True

     

       18
       18
       +
            else:

     

       19
       19
       +
                return False

     

       20
       20
       +
        

     

       21
       21
       +
       @@ -221,6 +216,11 @@ def is_preload_disabled():

     

       22
       22
       +
        if not is_preload_disabled():

     

       23
       23
       +
            config.available_features.add('preload')

     

       24
       24
       +
        

     

       25
       25
       +
       +# Preserve the variables required for the Nix toolchain wrappers.

     

       26
       26
       +
       +for var, value in os.environ.items():

     

       27
       27
       +
       +    if var.startswith('NIX_'):

     

       28
       28
       +
       +        config.environment[var] = value

     

       29
       29
       +
       +

     

       30
       30
       +
        print(config.substitutions)

     

       31
       31
       +
        print(config.environment)

     

       32
       32
       +
        print(config.available_features)

-27

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

···

       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@/@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";

     

       13
       13
       -
        

     

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

     

       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

     

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

     

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