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

cctools: drop suspicious dependency

This commit is contained in:
Andrew Childs 2020-11-19 16:39:27 +09:00
parent e44dd84664
commit bd4a45f5d4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook
, installShellFiles , installShellFiles
, libcxxabi, libuuid , libuuid
, libobjc ? null, maloader ? null , libobjc ? null, maloader ? null
, enableTapiSupport ? true, libtapi , enableTapiSupport ? true, libtapi
}: }:
@ -32,7 +32,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ];
buildInputs = [ libuuid ] buildInputs = [ libuuid ]
++ lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ lib.optionals stdenv.isDarwin [ libobjc ]
++ lib.optional enableTapiSupport libtapi; ++ lib.optional enableTapiSupport libtapi;
patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ]; patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ];

1
pkgs/top-level/darwin-packages.nix
View File

@ -59,7 +59,6 @@ impure-cmds // apple-source-releases // {
cctools = callPackage ../os-specific/darwin/cctools/port.nix { cctools = callPackage ../os-specific/darwin/cctools/port.nix {
stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
libcxxabi = pkgs.libcxxabi;
}; };
# TODO: remove alias. # TODO: remove alias.