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

cctools: only add libtool on native builds

Browse Source 
libtool is not really needed and it interferes with
updateAutotoolsGnuConfigScriptsHook. So remove it when
cross-compiling, but leave it in native to preserve hashes.
This commit is contained in:
Matthew Bauer 2019-11-25 21:48:26 -05:00
parent 010d2f4aa2
commit 6f8b2f3961
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,12 @@ let
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; nativeBuildInputs = [ autoconf automake ]
# TODO: remove on next hash change, libtool is unnecessary with autoreconfHook
++ stdenv.lib.optional (stdenv.targetPlatform == stdenv.hostPlatform) libtool
++ [ autoreconfHook ];
buildInputs = [ libuuid ] buildInputs = [ libuuid ]
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
++ stdenv.lib.optional enableTapiSupport libtapi; ++ stdenv.lib.optional enableTapiSupport libtapi;