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

revert realLibtool

Browse Source
This commit is contained in:
Jude Taylor 2015-09-28 09:16:05 -07:00
parent 25e582c497
commit 14bd5c0b39
2 changed files with 5 additions and 7 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 }: , ApplicationServices, CoreServices }:
@ -61,7 +61,7 @@ let
mkWithAutotools = stability: version: sha256: stdenv.mkDerivation { mkWithAutotools = stability: version: sha256: stdenv.mkDerivation {
name = mkName stability version; name = mkName stability version;
src = mkSrc version sha256; src = mkSrc version sha256;
buildInputs = [ automake autoconf realLibtool pkgconfig ] buildInputs = [ automake autoconf libtool pkgconfig ]
++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
preConfigure = '' preConfigure = ''
LIBTOOLIZE=libtoolize ./autogen.sh LIBTOOLIZE=libtoolize ./autogen.sh

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

@ -258,7 +258,7 @@ let
autonix = import ../build-support/autonix { inherit pkgs; }; autonix = import ../build-support/autonix { inherit pkgs; };
autoreconfHook = makeSetupHook autoreconfHook = makeSetupHook
{ substitutions = { inherit autoconf automake gettext; libtool = realLibtool; }; } { substitutions = { inherit autoconf automake gettext libtool; }; }
../build-support/setup-hooks/autoreconf.sh; ../build-support/setup-hooks/autoreconf.sh;
buildEnv = callPackage ../build-support/buildenv {}; buildEnv = callPackage ../build-support/buildenv {};
@ -5583,11 +5583,8 @@ let
lemon = callPackage ../development/tools/parsing/lemon { }; 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 { }; libtool_1_5 = callPackage ../development/tools/misc/libtool { };
@ -11121,6 +11118,7 @@ let
}); });
emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix { emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix {
stdenv = pkgs.clangStdenv; stdenv = pkgs.clangStdenv;
inherit (darwin.apple_sdk.frameworks) Carbon;
}); });
emacs24Macport = self.emacs24Macport_24_5; emacs24Macport = self.emacs24Macport_24_5;