diff options
author | Andrew Childs <lorne@cons.org.nz> | 2020-11-19 16:39:27 +0900 |
---|---|---|
committer | Andrew Childs <lorne@cons.org.nz> | 2021-05-17 00:27:00 +0900 |
commit | bd4a45f5d44c470c2646d15ae73c70eb1579ea77 (patch) | |
tree | aba428efeeb95d8c0068bb857cfa169afeb2b8cf | |
parent | e44dd84664f7723ed393e1c4e7e9b9fc95b1cc16 (diff) |
cctools: drop suspicious dependency
-rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/darwin-packages.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 50e0a2eb3fbfc..bace6f0689d9e 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook , installShellFiles -, libcxxabi, libuuid +, libuuid , libobjc ? null, maloader ? null , enableTapiSupport ? true, libtapi }: @@ -32,7 +32,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; buildInputs = [ libuuid ] - ++ lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] + ++ lib.optionals stdenv.isDarwin [ libobjc ] ++ lib.optional enableTapiSupport libtapi; patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ]; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 2af799e56460d..0209af4455a94 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -59,7 +59,6 @@ impure-cmds // apple-source-releases // { cctools = callPackage ../os-specific/darwin/cctools/port.nix { stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; - libcxxabi = pkgs.libcxxabi; }; # TODO: remove alias. |