diff --git a/pkgs/by-name/li/libuv/package.nix b/pkgs/by-name/li/libuv/package.nix index bcbf5472a7e2..c16084e0ac39 100644 --- a/pkgs/by-name/li/libuv/package.nix +++ b/pkgs/by-name/li/libuv/package.nix @@ -7,7 +7,6 @@ darwin, libtool, pkg-config, - pkgsStatic, # for passthru.tests bind, @@ -19,6 +18,7 @@ neovim, nodejs, ocamlPackages, + pkgsStatic, python3, testers, }: @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Y9Nph2LkT1qnOYTW3WCumWWwORnI4P7HxzBjUlGaL7M="; }; @@ -151,8 +151,6 @@ stdenv.mkDerivation (finalAttrs: { in lib.optionalString (finalAttrs.finalPackage.doCheck) '' sed '/${tdRegexp}/d' -i test/test-list.h - # https://github.com/libuv/libuv/issues/4794 - substituteInPlace Makefile.am --replace-fail -lutil "-lutil -lm" ''; nativeBuildInputs = [ @@ -162,6 +160,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; + strictDeps = true; + # This is part of the Darwin bootstrap, so we don’t always get # `libutil.dylib` automatically propagated through the SDK. buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -209,6 +209,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; + __structuredAttrs = true; + meta = { description = "Multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/";