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

alias libtool to darwin.cctools on darwin

Browse Source
This commit is contained in:
Jude Taylor 2015-09-20 13:08:38 -07:00
parent b868ec950d
commit 8a1b8a5b0a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, libtool
{ stdenv, fetchurl, autoconf, automake, libtool_2
, llvm, libcxx, libcxxabi, clang, openssl, libuuid
, libobjc ? null
}:
@ -18,7 +18,7 @@ let
sha256 = "01f31ijpnplbiyp7ldwzy8vbkn3j3m56n5blsvsav5nlp4lp2g71";
};
buildInputs = [ autoconf automake libtool openssl libuuid ] ++
buildInputs = [ autoconf automake libtool_2 openssl libuuid ] ++
# Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];

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

@ -2011,13 +2011,9 @@ let
ninka = callPackage ../development/tools/misc/ninka { };
nodejs-0_12 = callPackage ../development/web/nodejs {
libuv = libuvVersions.v1_6_1;
libtool = darwin.cctools;
};
nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_6_1; };
nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
libtool = darwin.cctools;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
};
@ -5566,7 +5562,9 @@ let
lemon = callPackage ../development/tools/parsing/lemon { };
libtool = libtool_2;
libtool = if stdenv.isDarwin
then darwin.cctools
else libtool_2;
libtool_1_5 = callPackage ../development/tools/misc/libtool { };