tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
cctools: drop suspicious dependency
Andrew Childs
4 years ago
bd4a45f5
e44dd846
+2
-3
2 changed files
expand all
collapse all
unified
split
pkgs
os-specific
darwin
cctools
port.nix
top-level
darwin-packages.nix
+2
-2
pkgs/os-specific/darwin/cctools/port.nix
···
1
1
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook
2
2
, installShellFiles
3
3
-
, libcxxabi, libuuid
3
3
+
, libuuid
4
4
, libobjc ? null, maloader ? null
5
5
, enableTapiSupport ? true, libtapi
6
6
}:
···
32
32
33
33
nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ];
34
34
buildInputs = [ libuuid ]
35
35
-
++ lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
35
35
+
++ lib.optionals stdenv.isDarwin [ libobjc ]
36
36
++ lib.optional enableTapiSupport libtapi;
37
37
38
38
patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ];
-1
pkgs/top-level/darwin-packages.nix
···
59
59
60
60
cctools = callPackage ../os-specific/darwin/cctools/port.nix {
61
61
stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
62
62
-
libcxxabi = pkgs.libcxxabi;
63
62
};
64
63
65
64
# TODO: remove alias.