public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

darwin purity: libuv, again

Browse Source
This commit is contained in:
Jude Taylor 2015-06-21 00:56:48 -07:00
parent 6f3729e3b3
commit 26da697f73
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libuv/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, CoreServices }: { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
, ApplicationServices, CoreServices }:
let let
stable = "stable"; stable = "stable";
@ -60,7 +62,7 @@ let
name = mkName stability version; name = mkName stability version;
src = mkSrc version sha256; src = mkSrc version sha256;
buildInputs = [ automake autoconf libtool pkgconfig ] buildInputs = [ automake autoconf libtool pkgconfig ]
++ stdenv.lib.optional stdenv.isDarwin CoreServices; ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
preConfigure = '' preConfigure = ''
LIBTOOLIZE=libtoolize ./autogen.sh LIBTOOLIZE=libtoolize ./autogen.sh
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -7180,7 +7180,7 @@ let
libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv {
automake = automake113x; # fails with 14 automake = automake113x; # fails with 14
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
}); });
libuv = libuvVersions.v1_6_1; libuv = libuvVersions.v1_6_1;