libuv: 1.23.2 -> 1.24.1

This commit is contained in:
Mathias Schreck 2019-01-08 11:45:37 +01:00
parent 1c10efc912
commit e96e5bc0d7
2 changed files with 7 additions and 11 deletions

View file

@ -1,23 +1,16 @@
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
version = "1.23.2";
version = "1.24.1";
name = "libuv-${version}";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${version}";
sha256 = "1xfggj0mbbshj7zyccnfw7wyk42qfg4ng3l4aslw014mg8gaskv7";
sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab";
};
patches = [
(fetchpatch {
url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch";
sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj";
})
];
postPatch = let
toDisable = [
"getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent
@ -52,6 +45,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
preConfigure = ''
LIBTOOLIZE=libtoolize ./autogen.sh

View file

@ -11417,7 +11417,9 @@ in
then darwin.libunwind
else callPackage ../development/libraries/libunwind { };
libuv = callPackage ../development/libraries/libuv { };
libuv = callPackage ../development/libraries/libuv {
inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
};
libv4l = lowPrio (v4l_utils.override {
withUtils = false;