commit 6d3ff29d038c05eab7c6989f88906912489e2ad9 · pyrox.dev/nixpkgs

+27 -2

pkgs/development/libraries/c-ares/default.nix

···

       1
       1
       -
       { stdenv, fetchurl }:

     

       1
       1
       +
       { stdenv, fetchurl, writeTextDir }:

     

       2
       2
        
       

     

       3
       3
       +
       let self =

     

       3
       4
        
       stdenv.mkDerivation rec {

     

       4
       5
        
         name = "c-ares-1.13.0";

     

       5
       6
        
       

     
···

       14
       15
        
           license = licenses.mit;

     

       15
       16
        
           platforms = platforms.all;

     

       16
       17
        
         };

     

       17
       17
       -
       }

     

       18
       18
       +
       

     

       19
       19
       +
         # Adapted from running a cmake build

     

       20
       20
       +
         passthru.cmake-config = writeTextDir "c-ares-config.cmake"

     

       21
       21
       +
           ''

     

       22
       22
       +
             set(c-ares_INCLUDE_DIR "${self}/include")

     

       23
       23
       +
       

     

       24
       24
       +
             set(c-ares_LIBRARY c-ares::cares)

     

       25
       25
       +
       

     

       26
       26
       +
             add_library(c-ares::cares SHARED IMPORTED)

     

       27
       27
       +
       

     

       28
       28
       +
             set_target_properties(c-ares::cares PROPERTIES

     

       29
       29
       +
               INTERFACE_INCLUDE_DIRECTORIES "${self}/include"

     

       30
       30
       +
               INTERFACE_LINK_LIBRARIES "nsl;rt"

     

       31
       31
       +
             )

     

       32
       32
       +
             set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)

     

       33
       33
       +
             set_target_properties(c-ares::cares PROPERTIES

     

       34
       34
       +
               IMPORTED_LOCATION_RELEASE "${self}/lib/libcares.so.2.2.0"

     

       35
       35
       +
               IMPORTED_SONAME_RELEASE "libcares.so.2"

     

       36
       36
       +
               )

     

       37
       37
       +
             add_library(c-ares::cares_shared INTERFACE IMPORTED)

     

       38
       38
       +
             set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")

     

       39
       39
       +
             set(c-ares_SHARED_LIBRARY c-ares::cares_shared)

     

       40
       40
       +
           '';

     

       41
       41
       +
       

     

       42
       42
       +
       }; in self

+19

pkgs/development/libraries/c-ares/release.patch

···

       1
       1
       +
       diff -aur c-ares-cares-1_13_0/ares_version.h c-ares-1.13.0/ares_version.h

     

       2
       2
       +
       --- c-ares-cares-1_13_0/ares_version.h	2017-06-20 02:00:21.000000000 -0400

     

       3
       3
       +
       +++ c-ares-1.13.0/ares_version.h	2017-06-20 02:03:54.000000000 -0400

     

       4
       4
       +
       @@ -6,12 +6,12 @@

     

       5
       5
       +
        #define ARES_COPYRIGHT "2004 - 2016 Daniel Stenberg, <daniel@haxx.se>."

     

       6
       6
       +
        

     

       7
       7
       +
        #define ARES_VERSION_MAJOR 1

     

       8
       8
       +
       -#define ARES_VERSION_MINOR 12

     

       9
       9
       +
       -#define ARES_VERSION_PATCH 1

     

       10
       10
       +
       +#define ARES_VERSION_MINOR 13

     

       11
       11
       +
       +#define ARES_VERSION_PATCH 0

     

       12
       12
       +
        #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\

     

       13
       13
       +
                               (ARES_VERSION_MINOR<<8)|\

     

       14
       14
       +
                               (ARES_VERSION_PATCH))

     

       15
       15
       +
       -#define ARES_VERSION_STR "1.12.1-DEV"

     

       16
       16
       +
       +#define ARES_VERSION_STR "1.13.0"

     

       17
       17
       +
        

     

       18
       18
       +
        #if (ARES_VERSION >= 0x010700)

     

       19
       19
       +
        #  define CARES_HAVE_ARES_LIBRARY_INIT 1

+19

pkgs/development/libraries/grpc/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec

     

       4
       4
       +
         { name = "grpc-1.8.3";

     

       5
       5
       +
           src = fetchurl

     

       6
       6
       +
             { url = "https://github.com/grpc/grpc/archive/v1.8.3.tar.gz";

     

       7
       7
       +
               sha256 = "14ichjllvhkbv8sjh9j5njnagpqw2sl12n41ga90jnj7qvfwwjy1";

     

       8
       8
       +
             };

     

       9
       9
       +
           nativeBuildInputs = [ cmake pkgconfig ];

     

       10
       10
       +
           buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];

     

       11
       11
       +
           cmakeFlags =

     

       12
       12
       +
             [ "-DgRPC_ZLIB_PROVIDER=package"

     

       13
       13
       +
               "-DgRPC_CARES_PROVIDER=package"

     

       14
       14
       +
               "-DgRPC_SSL_PROVIDER=package"

     

       15
       15
       +
               "-DgRPC_PROTOBUF_PROVIDER=package"

     

       16
       16
       +
               "-DgRPC_GFLAGS_PROVIDER=package"

     

       17
       17
       +
             ];

     

       18
       18
       +
           enableParallelBuilds = true;

     

       19
       19
       +
         }

+2

pkgs/top-level/all-packages.nix

···

       8664
       8664
        
       

     

       8665
       8665
        
         grib-api = callPackage ../development/libraries/grib-api { };

     

       8666
       8666
        
       

     

       8667
       8667
       +
         grpc = callPackage ../development/libraries/grpc { };

     

       8668
       8668
       +
       

     

       8667
       8669
        
         gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {

     

       8668
       8670
        
           callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; });

     

       8669
       8671
        
         });