From 8a1b8a5b0a4bc1bb7995f7f867a66a400259326c Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 20 Sep 2015 13:08:38 -0700
Subject: [PATCH] alias libtool to darwin.cctools on darwin
---
pkgs/os-specific/darwin/cctools/port.nix | 4 ++--
pkgs/top-level/all-packages.nix | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index bfb389ef37cf..e7165875aa4e 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -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 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b805dfcd7e4f..4de12627c29b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };