mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

revert realLibtool

Browse source
This commit is contained in:
Jude Taylor 2015-09-28 09:16:05 -07:00
parent 01f130e577
commit 406c366432
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libuv/default.nix
View file

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

16
pkgs/top-level/all-packages.nix
View file

@ -258,7 +258,7 @@ let
autonix = import ../build-support/autonix { inherit pkgs; };
autoreconfHook = makeSetupHook
{ substitutions = { inherit autoconf automake gettext; libtool = realLibtool; }; }
{ substitutions = { inherit autoconf automake gettext libtool; }; }
../build-support/setup-hooks/autoreconf.sh;
buildEnv = callPackage ../build-support/buildenv {};
@ -4857,9 +4857,7 @@ let
guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
guile_2_0 = callPackage ../development/interpreters/guile {
libtool = realLibtool;
};
guile_2_0 = callPackage ../development/interpreters/guile { };
guile = guile_2_0;
@ -5572,11 +5570,8 @@ let
lemon = callPackage ../development/tools/parsing/lemon { };
libtool = if stdenv.isDarwin
then darwin.cctools
else realLibtool;
realLibtool = libtool_2;
libtool = libtool_2;
libtool_1_5 = callPackage ../development/tools/misc/libtool { };
@ -6057,9 +6052,7 @@ let
db6 = db60;
db60 = callPackage ../development/libraries/db/db-6.0.nix { };
dbus = callPackage ../development/libraries/dbus {
libtool = realLibtool;
};
dbus = callPackage ../development/libraries/dbus { };
dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { };
dbus_glib = callPackage ../development/libraries/dbus-glib { };
dbus_java = callPackage ../development/libraries/java/dbus-java { };
@ -11044,6 +11037,7 @@ let
});
emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix {
stdenv = pkgs.clangStdenv;
inherit (darwin.apple_sdk.frameworks) Carbon;
});
emacs24Macport = self.emacs24Macport_24_5;