diff options
Diffstat (limited to 'pkgs/by-name/cc/cctools/package.nix')
| -rw-r--r-- | pkgs/by-name/cc/cctools/package.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/by-name/cc/cctools/package.nix b/pkgs/by-name/cc/cctools/package.nix index 2ab074def674..0368a3c4a985 100644 --- a/pkgs/by-name/cc/cctools/package.nix +++ b/pkgs/by-name/cc/cctools/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, buildPackages, - darwin, ld64, llvm, memstreamHook, @@ -38,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { "dev" "man" "gas" + "libtool" ]; src = fetchFromGitHub { @@ -127,13 +127,10 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - buildInputs = - [ - ld64 - llvm - ] - ++ lib.optionals stdenv.isDarwin [ darwin.objc4 ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ]; + buildInputs = [ + ld64 + llvm + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; mesonBuildType = "release"; @@ -153,6 +150,10 @@ stdenv.mkDerivation (finalAttrs: { for arch in arm i386 x86_64; do mv "$gas/libexec/as/$arch/as-$arch" "$gas/libexec/as/$arch/as" done + + # Move libtool to its own output to allow packages to add it without pulling in all of cctools + moveToOutput bin/${targetPrefix}libtool "$libtool" + ln -s "$libtool/bin/${targetPrefix}libtool" "$out/bin/${targetPrefix}libtool" ''; __structuredAttrs = true; @@ -169,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { apple-psl20 gpl2 # GNU as ]; - maintainers = with lib.maintainers; [ reckenrode ]; + maintainers = lib.teams.darwin.members; platforms = lib.platforms.darwin; }; }) |