commit 65f7e5d844c0f0dc28fa86da24c2a54c1b3eb23b · pyrox.dev/nixpkgs

+18

pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch

···

       1
       1
       +
       diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindProtobufAlt.cmake

     

       2
       2
       +
       index d29f757ae..61c6e16e1 100644

     

       3
       3
       +
       --- a/cmake_modules/FindProtobufAlt.cmake

     

       4
       4
       +
       +++ b/cmake_modules/FindProtobufAlt.cmake

     

       5
       5
       +
       @@ -22,11 +22,8 @@ else()

     

       6
       6
       +
        endif()

     

       7
       7
       +
        

     

       8
       8
       +
        set(find_package_args)

     

       9
       9
       +
       -if(ProtobufAlt_FIND_VERSION)

     

       10
       10
       +
       -  list(APPEND find_package_args ${ProtobufAlt_FIND_VERSION})

     

       11
       11
       +
       -endif()

     

       12
       12
       +
        if(ProtobufAlt_FIND_QUIETLY)

     

       13
       13
       +
          list(APPEND find_package_args QUIET)

     

       14
       14
       +
        endif()

     

       15
       15
       +
       -find_package(Protobuf ${find_package_args})

     

       16
       16
       +
       -set(ProtobufAlt_FOUND ${Protobuf_FOUND})

     

       17
       17
       +
       +find_package(protobuf ${find_package_args})

     

       18
       18
       +
       +set(ProtobufAlt_FOUND ${protobuf_FOUND})

pkgs/development/libraries/arrow-cpp/default.nix

···

       122
       122
        
         patches = [

     

       123
       123
        
           # patch to fix python-test

     

       124
       124
        
           ./darwin.patch

     

       125
       125
       +
           ./cmake-find-protobuf.patch

     

       125
       126
        
         ];

     

       126
       127
        
       

     

       127
       128
        
         nativeBuildInputs = [

     
···

       169
       170
        
         '';

     

       170
       171
        
       

     

       171
       172
        
         cmakeFlags = [

     

       173
       173
       +
           "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"

     

       172
       174
        
           "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}"

     

       173
       175
        
           "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}"

     

       174
       176
        
           "-DARROW_BUILD_TESTS=ON"