nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

tree-wide: use top-level cctools

Browse Source
This commit is contained in:
Randy Eckenrode 2024-07-17 22:16:28 -04:00
parent 20cf80e167
commit f9b7f4ec09
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
57 changed files with 123 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/blockchains/clightning/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, cctools
, darwin , darwin
, fetchurl , fetchurl
, autoconf , autoconf
@ -30,11 +31,11 @@ stdenv.mkDerivation rec {
hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg="; hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg=";
}; };
# when building on darwin we need dawin.cctools to provide the correct libtool # when building on darwin we need cctools to provide the correct libtool
# as libwally-core detects the host as darwin and tries to add the -static # as libwally-core detects the host as darwin and tries to add the -static
# option to libtool, also we have to add the modified gsed package. # option to libtool, also we have to add the modified gsed package.
nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ] nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ]; ++ lib.optionals stdenv.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ];
buildInputs = [ gmp libsodium sqlite zlib jq ]; buildInputs = [ gmp libsodium sqlite zlib jq ];

4
pkgs/applications/networking/irc/thelounge/default.nix
View File

@ -7,7 +7,7 @@
, fixup-yarn-lock , fixup-yarn-lock
, python3 , python3
, npmHooks , npmHooks
, darwin , cctools
, sqlite , sqlite
, srcOnly , srcOnly
, buildPackages , buildPackages
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0=";
}; };
nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools; nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin cctools;
buildInputs = [ sqlite ]; buildInputs = [ sqlite ];
configurePhase = '' configurePhase = ''

4
pkgs/build-support/node/build-npm-package/default.nix
View File

@ -3,7 +3,7 @@
, fetchNpmDeps , fetchNpmDeps
, buildPackages , buildPackages
, nodejs , nodejs
, darwin , cctools
} @ topLevelArgs: } @ topLevelArgs:
{ name ? "${args.pname}-${args.version}" { name ? "${args.pname}-${args.version}"
@ -76,7 +76,7 @@ stdenv.mkDerivation (args // {
(if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook) (if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook)
nodejs.python nodejs.python
] ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; ++ lib.optionals stdenv.isDarwin [ cctools ];
buildInputs = buildInputs ++ [ nodejs ]; buildInputs = buildInputs ++ [ nodejs ];
strictDeps = true; strictDeps = true;

4
pkgs/by-name/bi/bitwarden-cli/package.nix
View File

@ -4,7 +4,7 @@
, nodejs_20 , nodejs_20
, fetchFromGitHub , fetchFromGitHub
, python311 , python311
, darwin , cctools
, nixosTests , nixosTests
, xcbuild , xcbuild
}: }:
@ -27,7 +27,7 @@ buildNpmPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
python311 python311
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.cctools cctools
xcbuild.xcrun xcbuild.xcrun
]; ];

3
pkgs/by-name/fr/frankenphp/package.nix
View File

@ -6,6 +6,7 @@
, brotli , brotli
, testers , testers
, frankenphp , frankenphp
, cctools
, darwin , darwin
, libiconv , libiconv
, pkg-config , pkg-config
@ -44,7 +45,7 @@ in buildGoModule rec {
vendorHash = "sha256-Ir1lwTu3JqIFp9jhJyhTAFm/+XlStkPuCoNAZneeKGc="; vendorHash = "sha256-Ir1lwTu3JqIFp9jhJyhTAFm/+XlStkPuCoNAZneeKGc=";
buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs; buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs;
nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ]; nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config cctools darwin.autoSignDarwinBinariesHook ];
subPackages = [ "frankenphp" ]; subPackages = [ "frankenphp" ];

4
pkgs/by-name/li/live555/package.nix
View File

@ -1,6 +1,6 @@
{ {
lib, lib,
darwin, cctools,
fetchpatch, fetchpatch,
fetchurl, fetchurl,
openssl, openssl,
@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
nativeBuildInputs = lib.optionals stdenv.isDarwin [ nativeBuildInputs = lib.optionals stdenv.isDarwin [
darwin.cctools cctools
]; ];
buildInputs = [ buildInputs = [

4
pkgs/by-name/my/mysql84/package.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, bison, cmake, pkg-config { lib, stdenv, fetchurl, bison, cmake, pkg-config
, icu, libedit, libevent, lz4, ncurses, openssl, protobuf_21, re2, readline, zlib, zstd, libfido2 , icu, libedit, libevent, lz4, ncurses, openssl, protobuf_21, re2, readline, zlib, zstd, libfido2
, darwin, numactl, libtirpc, rpcsvc-proto, curl , cctools, darwin, numactl, libtirpc, rpcsvc-proto, curl
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
numactl libtirpc numactl libtirpc
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.cctools darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools cctools darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools
]; ];
outputs = [ "out" "static" ]; outputs = [ "out" "static" ];

4
pkgs/by-name/pe/petsc/package.nix
View File

@ -2,7 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchzip, fetchzip,
darwin, cctools,
gfortran, gfortran,
python3, python3,
blas, blas,
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
prePatch = lib.optionalString stdenv.isDarwin '' prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace config/install.py \ substituteInPlace config/install.py \
--replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool
''; '';
# Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr):

4
pkgs/by-name/pr/protoc-gen-js/package.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildBazelPackage, bazel_6, fetchFromGitHub, darwin }: { stdenv, lib, buildBazelPackage, bazel_6, fetchFromGitHub, cctools }:
buildBazelPackage rec { buildBazelPackage rec {
pname = "protoc-gen-js"; pname = "protoc-gen-js";
@ -17,7 +17,7 @@ buildBazelPackage rec {
removeRulesCC = false; removeRulesCC = false;
removeLocalConfigCC = false; removeLocalConfigCC = false;
LIBTOOL = lib.optionalString stdenv.isDarwin "${darwin.cctools}/bin/libtool"; LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";
fetchAttrs.sha256 = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ="; fetchAttrs.sha256 = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ=";

4
pkgs/by-name/ri/ride/package.nix
View File

@ -12,7 +12,7 @@
copyDesktopItems, copyDesktopItems,
makeDesktopItem, makeDesktopItem,
electron, electron,
darwin, cctools,
}: }:
let let
@ -92,7 +92,7 @@ buildNpmPackage rec {
makeWrapper makeWrapper
] ]
++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; ++ lib.optionals stdenv.isDarwin [ cctools ];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

4
pkgs/data/fonts/iosevka/default.nix
View File

@ -2,7 +2,7 @@
, lib , lib
, buildNpmPackage , buildNpmPackage
, fetchFromGitHub , fetchFromGitHub
, darwin , cctools
, remarshal , remarshal
, ttfautohint-nox , ttfautohint-nox
# Custom font set options. # Custom font set options.
@ -71,7 +71,7 @@ buildNpmPackage rec {
ttfautohint-nox ttfautohint-nox
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
# libtool # libtool
darwin.cctools cctools
]; ];
buildPlan = buildPlan =

4
pkgs/development/compilers/chez-racket/shared.nix
View File

@ -1,5 +1,5 @@
args: args:
{ stdenv, lib, fetchFromGitHub, coreutils, darwin { stdenv, lib, fetchFromGitHub, coreutils, cctools, darwin
, ncurses, libiconv, libX11, zlib, lz4 , ncurses, libiconv, libX11, zlib, lz4
}: }:
@ -23,7 +23,7 @@ stdenv.mkDerivation (args // {
export LZ4="$(find ${lz4.out}/lib -type f | sort | head -n1)" export LZ4="$(find ${lz4.out}/lib -type f | sort | head -n1)"
''; '';
nativeBuildInputs = lib.optionals stdenv.isDarwin (with darwin; [ cctools autoSignDarwinBinariesHook ]); nativeBuildInputs = lib.optionals stdenv.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]);
buildInputs = [ libiconv libX11 lz4 ncurses zlib ]; buildInputs = [ libiconv libX11 lz4 ncurses zlib ];
enableParallelBuilding = true; enableParallelBuilding = true;

3
pkgs/development/compilers/dart/default.nix
View File

@ -3,6 +3,7 @@
, fetchurl , fetchurl
, unzip , unzip
, runCommand , runCommand
, cctools
, darwin , darwin
, sources ? import ./sources.nix {inherit fetchurl;} , sources ? import ./sources.nix {inherit fetchurl;}
, version ? sources.versionUsed , version ? sources.versionUsed
@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
testCompile = runCommand "dart-test-compile" { testCompile = runCommand "dart-test-compile" {
nativeBuildInputs = [ finalAttrs.finalPackage ] nativeBuildInputs = [ finalAttrs.finalPackage ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.sigtool ]; ++ lib.optionals stdenv.isDarwin [ cctools darwin.sigtool ];
} '' } ''
HELLO_MESSAGE="Hello, world!" HELLO_MESSAGE="Hello, world!"
echo "void main() => print('$HELLO_MESSAGE');" > hello.dart echo "void main() => print('$HELLO_MESSAGE');" > hello.dart

7
pkgs/development/compilers/dotnet/sigtool.nix
View File

@ -1,11 +1,10 @@
{ darwin { cctools
, darwin
, fetchFromGitHub , fetchFromGitHub
, makeWrapper , makeWrapper
}: }:
let
cctools = darwin.cctools;
in darwin.sigtool.overrideAttrs (old: { darwin.sigtool.overrideAttrs (old: {
# this is a fork of sigtool that supports -v and --remove-signature, which are # this is a fork of sigtool that supports -v and --remove-signature, which are
# used by the dotnet sdk # used by the dotnet sdk
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/development/compilers/elm/packages/node/node-composition.nix
View File

@ -8,7 +8,7 @@ let
nodeEnv = import ../../../../node-packages/node-env.nix { nodeEnv = import ../../../../node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {

3
pkgs/development/compilers/gcc/default.nix
View File

@ -33,6 +33,7 @@
, nukeReferences , nukeReferences
, callPackage , callPackage
, majorMinorVersion , majorMinorVersion
, cctools
, darwin , darwin
# only for gcc<=6.x # only for gcc<=6.x
@ -457,7 +458,7 @@ pipe ((callFile ./common/builder.nix {}) ({
} // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) { } // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) {
# GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools. # GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools.
preBuild = '' preBuild = ''
makeFlagsArray+=('STRIP=${getBin darwin.cctools-port}/bin/${stdenv.cc.targetPrefix}strip') makeFlagsArray+=('STRIP=${getBin cctools}/bin/${stdenv.cc.targetPrefix}strip')
''; '';
} // optionalAttrs (!atLeast8) { } // optionalAttrs (!atLeast8) {
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv

4
pkgs/development/compilers/gcc/patches/default.nix
View File

@ -273,9 +273,9 @@ in
./6/gnat-glibc234.patch ./6/gnat-glibc234.patch
] ]
# The clang-based assembler used in darwin.cctools-llvm (LLVM >11) does not support piping input. # The clang-based assembler used in darwin.binutils (LLVM >11) does not support piping input.
# Fortunately, it does not exhibit the problem GCC has with the cctools assembler. # Fortunately, it does not exhibit the problem GCC has with the cctools assembler.
# This patch can be dropped should darwin.cctools-llvm ever implement support. # This patch can be dropped should darwin.binutils ever implement support.
++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch ++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch
# Building libstdc++ with flat namespaces results in trying to link CoreFoundation, which # Building libstdc++ with flat namespaces results in trying to link CoreFoundation, which

3
pkgs/development/compilers/ponyc/default.nix
View File

@ -13,6 +13,7 @@
, substituteAll , substituteAll
, which , which
, z3 , z3
, cctools
, darwin , darwin
}: }:
@ -36,7 +37,7 @@ stdenv.mkDerivation (rec {
}; };
nativeBuildInputs = [ cmake makeWrapper which python3 ] nativeBuildInputs = [ cmake makeWrapper which python3 ]
++ lib.optionals (stdenv.isDarwin) [ darwin.cctools ]; ++ lib.optionals (stdenv.isDarwin) [ cctools ];
buildInputs = [ libxml2 z3 ]; buildInputs = [ libxml2 z3 ];
# Sandbox disallows network access, so disabling problematic networking tests # Sandbox disallows network access, so disabling problematic networking tests

4
pkgs/development/compilers/swift/default.nix
View File

@ -58,7 +58,7 @@ let
xcbuild = xcodebuild; xcbuild = xcodebuild;
swift-unwrapped = callPackage ./compiler { swift-unwrapped = callPackage ./compiler {
inherit (darwin) DarwinTools cctools sigtool; inherit (darwin) DarwinTools sigtool;
inherit (apple_sdk) MacOSX-SDK CLTools_Executables; inherit (apple_sdk) MacOSX-SDK CLTools_Executables;
inherit (apple_sdk.frameworks) CoreServices Foundation Combine; inherit (apple_sdk.frameworks) CoreServices Foundation Combine;
}; };
@ -85,7 +85,7 @@ let
}; };
swiftpm = callPackage ./swiftpm { swiftpm = callPackage ./swiftpm {
inherit (darwin) DarwinTools cctools; inherit (darwin) DarwinTools;
inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication;
swift = swiftNoSwiftDriver; swift = swiftNoSwiftDriver;
}; };

6
pkgs/development/interpreters/cyclone/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libck, darwin }: { lib, stdenv, fetchFromGitHub, libck, cctools }:
let let
version = "0.34.0"; version = "0.34.0";
@ -15,7 +15,7 @@ let
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools ];
buildInputs = [ libck ]; buildInputs = [ libck ];
@ -36,7 +36,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ bootstrap ] nativeBuildInputs = [ bootstrap ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; ++ lib.optionals stdenv.isDarwin [ cctools ];
buildInputs = [ libck ]; buildInputs = [ libck ];

4
pkgs/development/libraries/catboost/default.nix
View File

@ -2,7 +2,7 @@
, config , config
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, darwin , cctools
, libiconv , libiconv
, llvmPackages , llvmPackages
, ninja , ninja
@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
ragel ragel
yasm yasm
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.cctools cctools
] ++ lib.optionals cudaSupport (with cudaPackages; [ ] ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_nvcc cuda_nvcc
]); ]);

4
pkgs/development/libraries/freeimage/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchsvn, darwin, libtiff { lib, stdenv, fetchsvn, cctools, libtiff
, libpng, zlib, libwebp, libraw, openexr, openjpeg , libpng, zlib, libwebp, libraw, openexr, openjpeg
, libjpeg, jxrlib, pkg-config , libjpeg, jxrlib, pkg-config
, fixDarwinDylibNames, autoSignDarwinBinariesHook }: , fixDarwinDylibNames, autoSignDarwinBinariesHook }:
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.cctools cctools
fixDarwinDylibNames fixDarwinDylibNames
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
autoSignDarwinBinariesHook autoSignDarwinBinariesHook

4
pkgs/development/libraries/libmcrypt/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }: { lib, stdenv, fetchurl, cctools, disablePosixThreads ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmcrypt"; pname = "libmcrypt";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";
}; };
buildInputs = lib.optional stdenv.isDarwin darwin.cctools; buildInputs = lib.optional stdenv.isDarwin cctools;
configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ] configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ]
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

4
pkgs/development/libraries/nss/generic.nix
View File

@ -7,7 +7,7 @@
, zlib , zlib
, sqlite , sqlite
, ninja , ninja
, darwin , cctools
, fixDarwinDylibNames , fixDarwinDylibNames
, buildPackages , buildPackages
, useP11kit ? true , useP11kit ? true
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames ];
buildInputs = [ zlib sqlite ]; buildInputs = [ zlib sqlite ];

2
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -314,7 +314,7 @@ let
in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
inherit (srcs.qtwebengine) version; inherit (srcs.qtwebengine) version;
python = python3; python = python3;
inherit (darwin) cctools xnu; inherit (darwin) xnu;
inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0) libpm libunwind;
inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.libs) sandbox;
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit

2
pkgs/development/libraries/qt-6/default.nix
View File

@ -152,7 +152,7 @@ let
qtwayland = callPackage ./modules/qtwayland.nix { }; qtwayland = callPackage ./modules/qtwayland.nix { };
qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
qtwebengine = callPackage ./modules/qtwebengine.nix { qtwebengine = callPackage ./modules/qtwebengine.nix {
inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds cctools xnu; inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu;
inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0) libpm libunwind;
inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.libs) sandbox;
inherit (darwin.apple_sdk_11_0.frameworks) inherit (darwin.apple_sdk_11_0.frameworks)

4
pkgs/development/libraries/science/math/mkl/default.nix
View File

@ -5,7 +5,7 @@
, fetchurl , fetchurl
, rpmextract , rpmextract
, _7zz , _7zz
, darwin , cctools
, validatePkgConfig , validatePkgConfig
, enableStatic ? stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic
}: }:
@ -72,7 +72,7 @@ in stdenvNoCC.mkDerivation ({
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
then then
[ _7zz darwin.cctools ] [ _7zz cctools ]
else else
[ rpmextract ]); [ rpmextract ]);

2
pkgs/development/node-packages/composition.nix
View File

@ -8,7 +8,7 @@ let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {

2
pkgs/development/r-modules/default.nix
View File

@ -1256,7 +1256,7 @@ let
pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: { pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: {
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''
for file in R/*.{r,r.in}; do for file in R/*.{r,r.in}; do
sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.cctools}/bin/\1"#g' $file
done done
''; '';
}); });

5
pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
View File

@ -3,6 +3,7 @@
, bazel-examples , bazel-examples
, bazelTest , bazelTest
, callPackage , callPackage
, cctools
, darwin , darwin
, distDir , distDir
, extraBazelArgs ? "" , extraBazelArgs ? ""
@ -37,8 +38,8 @@ let
#! ${runtimeShell} #! ${runtimeShell}
export CXX='${stdenv.cc}/bin/clang++' export CXX='${stdenv.cc}/bin/clang++'
export LD='${darwin.cctools}/bin/ld' export LD='${cctools}/bin/ld'
export LIBTOOL='${darwin.cctools}/bin/libtool' export LIBTOOL='${cctools}/bin/libtool'
export CC='${stdenv.cc}/bin/clang' export CC='${stdenv.cc}/bin/clang'
# XXX: hack for macosX, this flags disable bazel usage of xcode # XXX: hack for macosX, this flags disable bazel usage of xcode

6
pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
View File

@ -4,7 +4,7 @@
, stdenv , stdenv
, symlinkJoin , symlinkJoin
, callPackage , callPackage
, darwin , cctools
, extraBazelArgs ? "" , extraBazelArgs ? ""
, lib , lib
, openjdk8 , openjdk8
@ -38,8 +38,8 @@ let
#! ${runtimeShell} #! ${runtimeShell}
export CXX='${stdenv.cc}/bin/clang++' export CXX='${stdenv.cc}/bin/clang++'
export LD='${darwin.cctools}/bin/ld' export LD='${cctools}/bin/ld'
export LIBTOOL='${darwin.cctools}/bin/libtool' export LIBTOOL='${cctools}/bin/libtool'
export CC='${stdenv.cc}/bin/clang' export CC='${stdenv.cc}/bin/clang'
# XXX: hack for macosX, this flags disable bazel usage of xcode # XXX: hack for macosX, this flags disable bazel usage of xcode

5
pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
View File

@ -2,6 +2,7 @@
, Foundation , Foundation
, bazelTest , bazelTest
, callPackage , callPackage
, cctools
, darwin , darwin
, distDir , distDir
, extraBazelArgs ? "" , extraBazelArgs ? ""
@ -97,8 +98,8 @@ let
#! ${runtimeShell} #! ${runtimeShell}
export CXX='${stdenv.cc}/bin/clang++' export CXX='${stdenv.cc}/bin/clang++'
export LD='${darwin.cctools}/bin/ld' export LD='${cctools}/bin/ld'
export LIBTOOL='${darwin.cctools}/bin/libtool' export LIBTOOL='${cctools}/bin/libtool'
export CC='${stdenv.cc}/bin/clang' export CC='${stdenv.cc}/bin/clang'
# XXX: hack for macosX, this flags disable bazel usage of xcode # XXX: hack for macosX, this flags disable bazel usage of xcode

5
pkgs/development/tools/build-managers/bazel/cpp-test.nix
View File

@ -3,6 +3,7 @@
, bazelTest , bazelTest
, bazel-examples , bazel-examples
, stdenv , stdenv
, cctools
, darwin , darwin
, extraBazelArgs ? "" , extraBazelArgs ? ""
, lib , lib
@ -20,8 +21,8 @@ let
#! ${runtimeShell} #! ${runtimeShell}
export CXX='${stdenv.cc}/bin/clang++' export CXX='${stdenv.cc}/bin/clang++'
export LD='${darwin.cctools}/bin/ld' export LD='${cctools}/bin/ld'
export LIBTOOL='${darwin.cctools}/bin/libtool' export LIBTOOL='${cctools}/bin/libtool'
export CC='${stdenv.cc}/bin/clang' export CC='${stdenv.cc}/bin/clang'
# XXX: hack for macosX, this flags disable bazel usage of xcode # XXX: hack for macosX, this flags disable bazel usage of xcode

6
pkgs/development/tools/build-managers/bazel/java-test.nix
View File

@ -2,7 +2,7 @@
, bazelTest , bazelTest
, bazel-examples , bazel-examples
, stdenv , stdenv
, darwin , cctools
, extraBazelArgs ? "" , extraBazelArgs ? ""
, lib , lib
, openjdk8 , openjdk8
@ -20,8 +20,8 @@ let
#! ${runtimeShell} #! ${runtimeShell}
export CXX='${stdenv.cc}/bin/clang++' export CXX='${stdenv.cc}/bin/clang++'
export LD='${darwin.cctools}/bin/ld' export LD='${cctools}/bin/ld'
export LIBTOOL='${darwin.cctools}/bin/libtool' export LIBTOOL='${cctools}/bin/libtool'
export CC='${stdenv.cc}/bin/clang' export CC='${stdenv.cc}/bin/clang'
# XXX: hack for macosX, this flags disable bazel usage of xcode # XXX: hack for macosX, this flags disable bazel usage of xcode

6
pkgs/development/tools/build-managers/bazel/protobuf-test.nix
View File

@ -4,7 +4,7 @@
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, stdenv , stdenv
, darwin , cctools
, lib , lib
, openjdk8 , openjdk8
, jdk11_headless , jdk11_headless
@ -134,8 +134,8 @@ let
#! ${runtimeShell} #! ${runtimeShell}
export CXX='${stdenv.cc}/bin/clang++' export CXX='${stdenv.cc}/bin/clang++'
export LD='${darwin.cctools}/bin/ld' export LD='${cctools}/bin/ld'
export LIBTOOL='${darwin.cctools}/bin/libtool' export LIBTOOL='${cctools}/bin/libtool'
export CC='${stdenv.cc}/bin/clang' export CC='${stdenv.cc}/bin/clang'
# XXX: hack for macosX, this flags disable bazel usage of xcode # XXX: hack for macosX, this flags disable bazel usage of xcode

6
pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
View File

@ -2,7 +2,7 @@
bazel bazel
, bazelTest , bazelTest
, stdenv , stdenv
, darwin , cctools
, extraBazelArgs ? "" , extraBazelArgs ? ""
, lib , lib
, runLocal , runLocal
@ -17,8 +17,8 @@ let
#! ${runtimeShell} #! ${runtimeShell}
export CXX='${stdenv.cc}/bin/clang++' export CXX='${stdenv.cc}/bin/clang++'
export LD='${darwin.cctools}/bin/ld' export LD='${cctools}/bin/ld'
export LIBTOOL='${darwin.cctools}/bin/libtool' export LIBTOOL='${cctools}/bin/libtool'
export CC='${stdenv.cc}/bin/clang' export CC='${stdenv.cc}/bin/clang'
# XXX: hack for macosX, this flags disable bazel usage of xcode # XXX: hack for macosX, this flags disable bazel usage of xcode

2
pkgs/development/tools/build-managers/gn/generic.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, darwin, writeText { stdenv, lib, fetchgit, cctools, darwin, writeText
, ninja, python3 , ninja, python3
, ... , ...
}: }:

3
pkgs/development/tools/nodehun/default.nix
View File

@ -1,4 +1,5 @@
{ buildNpmPackage { buildNpmPackage
, cctools
, darwin , darwin
, fetchFromGitHub , fetchFromGitHub
, lib , lib
@ -31,7 +32,7 @@ buildNpmPackage {
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
nativeBuildInputs = [ nodePackages.node-gyp python3 ] nativeBuildInputs = [ nodePackages.node-gyp python3 ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; ++ lib.optionals stdenv.isDarwin [ cctools ];
postInstall = '' postInstall = ''
# Only keep the necessary parts of build/Release to reduce closure size # Only keep the necessary parts of build/Release to reduce closure size

2
pkgs/development/tools/xcbuild/toolchains.nix
View File

@ -60,7 +60,7 @@ runCommand "Toolchains" {} (''
ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent
ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags
'' + optionalString stdenv.isDarwin '' '' + optionalString stdenv.isDarwin ''
for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do for bin in ${getBin buildPackages.cctools}/bin/*; do
if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then
ln -s $bin $toolchain/bin ln -s $bin $toolchain/bin
fi fi

2
pkgs/development/web/netlify-cli/composition.nix
View File

@ -8,7 +8,7 @@ let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {

2
pkgs/development/web/playwright-test/default.nix
View File

@ -8,7 +8,7 @@ let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin or pkgs.darwin.cctools else null;
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {

2
pkgs/misc/base16-builder/node-packages.nix generated
View File

@ -12,7 +12,7 @@ let
nodeEnv = import ../../development/node-packages/node-env.nix { nodeEnv = import ../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
}; };
in in
import ./node-packages-generated.nix { import ./node-packages-generated.nix {

1
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -56,7 +56,6 @@ makeScopeWithSplicing' {
compat = self.callPackage ./pkgs/compat/package.nix { compat = self.callPackage ./pkgs/compat/package.nix {
inherit (buildPackages) coreutils; inherit (buildPackages) coreutils;
inherit (buildPackages.darwin) cctools-port;
inherit (buildNetbsd) makeMinimal; inherit (buildNetbsd) makeMinimal;
inherit (self) install; inherit (self) install;
}; };

4
pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
View File

@ -5,7 +5,7 @@
zlib, zlib,
defaultMakeFlags, defaultMakeFlags,
coreutils, coreutils,
cctools-port, cctools,
install, install,
bsdSetupHook, bsdSetupHook,
netbsdSetupHook, netbsdSetupHook,
@ -72,7 +72,7 @@ mkDerivation (
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
# GNU objcopy produces broken .a libs which won't link into dependers. # GNU objcopy produces broken .a libs which won't link into dependers.
# Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here.
"OBJCOPY=${cctools-port}/bin/strip" "OBJCOPY=${cctools}/bin/strip"
]; ];
RENAME = "-D"; RENAME = "-D";

2
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
View File

@ -61,7 +61,7 @@ appleDerivation' stdenv {
(cd $dep/include && find . -name '*.h' | copyHierarchy $out/include) (cd $dep/include && find . -name '*.h' | copyHierarchy $out/include)
done done
(cd ${lib.getDev buildPackages.darwin.cctools}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o) (cd ${lib.getDev buildPackages.cctools}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o)
for header in pthread.h pthread_impl.h pthread_spis.h sched.h; do for header in pthread.h pthread_impl.h pthread_spis.h sched.h; do
ln -s "$out/include/pthread/$header" "$out/include/$header" ln -s "$out/include/pthread/$header" "$out/include/$header"

2
pkgs/servers/mx-puppet-discord/node-composition.nix
View File

@ -8,7 +8,7 @@ let
nodeEnv = import ../../development/node-packages/node-env.nix { nodeEnv = import ../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {

4
pkgs/servers/sql/mariadb/default.nix
View File

@ -247,21 +247,18 @@ in
# TODO should be removed # TODO should be removed
version = "10.5.25"; version = "10.5.25";
hash = "sha256-lhnQ9R6GQ1dGayxjMBo0pT99/ZnxjE/UUvqyK/Obpk4="; hash = "sha256-lhnQ9R6GQ1dGayxjMBo0pT99/ZnxjE/UUvqyK/Obpk4=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices; inherit (self.darwin.apple_sdk.frameworks) CoreServices;
}; };
mariadb_106 = self.callPackage generic { mariadb_106 = self.callPackage generic {
# Supported until 2026-07-06 # Supported until 2026-07-06
version = "10.6.18"; version = "10.6.18";
hash = "sha256-aJihER9HEwcJ4ouix70aV+S7VxAfbhCeWX1R5tOFzxg="; hash = "sha256-aJihER9HEwcJ4ouix70aV+S7VxAfbhCeWX1R5tOFzxg=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices; inherit (self.darwin.apple_sdk.frameworks) CoreServices;
}; };
mariadb_1011 = self.callPackage generic { mariadb_1011 = self.callPackage generic {
# Supported until 2028-02-16 # Supported until 2028-02-16
version = "10.11.8"; version = "10.11.8";
hash = "sha256-XwTz4z2fHL7/BeecVNQdMCYwUAyZWu5ysGOOL5383w8="; hash = "sha256-XwTz4z2fHL7/BeecVNQdMCYwUAyZWu5ysGOOL5383w8=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices; inherit (self.darwin.apple_sdk.frameworks) CoreServices;
}; };
mariadb_110 = self.callPackage generic { mariadb_110 = self.callPackage generic {
@ -269,7 +266,6 @@ in
# TODO should be removed # TODO should be removed
version = "11.0.6"; version = "11.0.6";
hash = "sha256-AYnWKUbDfG20a/GkaLqVgLy6joDwWVjsSDwzh+zPmgA="; hash = "sha256-AYnWKUbDfG20a/GkaLqVgLy6joDwWVjsSDwzh+zPmgA=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices; inherit (self.darwin.apple_sdk.frameworks) CoreServices;
}; };
} }

4
pkgs/servers/sql/percona-server/default.nix
View File

@ -1,13 +1,13 @@
pkgs: { pkgs: {
percona-server_lts = pkgs.callPackage ./lts.nix { percona-server_lts = pkgs.callPackage ./lts.nix {
inherit (pkgs.darwin) cctools developer_cmds DarwinTools; inherit (pkgs.darwin) developer_cmds DarwinTools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
boost = pkgs.boost177; # Configure checks for specific version. boost = pkgs.boost177; # Configure checks for specific version.
icu = pkgs.icu69; icu = pkgs.icu69;
protobuf = pkgs.protobuf_21; protobuf = pkgs.protobuf_21;
}; };
percona-server_innovation = pkgs.callPackage ./innovation.nix { percona-server_innovation = pkgs.callPackage ./innovation.nix {
inherit (pkgs.darwin) cctools developer_cmds DarwinTools; inherit (pkgs.darwin) developer_cmds DarwinTools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
# newer versions cause linking failures against `libabsl_spinlock_wait` # newer versions cause linking failures against `libabsl_spinlock_wait`
protobuf = pkgs.protobuf_21; protobuf = pkgs.protobuf_21;

2
pkgs/servers/web-apps/ethercalc/node-packages.nix generated
View File

@ -8,7 +8,7 @@ let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
}; };
in in
import ./node-packages-generated.nix { import ./node-packages-generated.nix {

3
pkgs/tools/admin/balena-cli/default.nix
View File

@ -8,6 +8,7 @@
, nodePackages , nodePackages
, python3 , python3
, udev , udev
, cctools
, darwin , darwin
}: }:
@ -38,7 +39,7 @@ in buildNpmPackage' rec {
nodePackages.node-gyp nodePackages.node-gyp
python3 python3
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.cctools cctools
]; ];
buildInputs = lib.optionals stdenv.isLinux [ buildInputs = lib.optionals stdenv.isLinux [

4
pkgs/tools/audio/dl-librescore/default.nix
View File

@ -3,7 +3,7 @@
, buildNpmPackage , buildNpmPackage
, fetchFromGitHub , fetchFromGitHub
, python3 , python3
, darwin , cctools
}: }:
buildNpmPackage rec { buildNpmPackage rec {
@ -31,7 +31,7 @@ buildNpmPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
python3 python3
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.cctools cctools
]; ];
meta = { meta = {

4
pkgs/tools/misc/hsd/default.nix
View File

@ -4,7 +4,7 @@
, fetchFromGitHub , fetchFromGitHub
, python3 , python3
, unbound , unbound
, darwin , cctools
}: }:
buildNpmPackage rec { buildNpmPackage rec {
@ -23,7 +23,7 @@ buildNpmPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
python3 python3
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.cctools cctools
]; ];
buildInputs = [ buildInputs = [

4
pkgs/tools/misc/moreutils/default.nix
View File

@ -8,7 +8,7 @@
, perlPackages , perlPackages
, makeWrapper , makeWrapper
, perl # for pod2man , perl # for pod2man
, darwin , cctools
, gitUpdater , gitUpdater
}: }:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
(perl.withPackages (p: [ p.IPCRun p.TimeDate p.TimeDuration ])) (perl.withPackages (p: [ p.IPCRun p.TimeDate p.TimeDuration ]))
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.cctools cctools
]; ];
makeFlags = [ makeFlags = [

4
pkgs/tools/networking/curl-impersonate/default.nix
View File

@ -16,7 +16,7 @@
, autoconf , autoconf
, automake , automake
, libtool , libtool
, darwin , cctools
, cacert , cacert
, unzip , unzip
, go , go
@ -63,7 +63,7 @@ let
nativeBuildInputs = lib.optionals stdenv.isDarwin [ nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Must come first so that it shadows the 'libtool' command but leaves 'libtoolize' # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize'
darwin.cctools cctools
] ++ [ ] ++ [
installShellFiles installShellFiles
cmake cmake

2
pkgs/tools/security/onlykey/onlykey.nix
View File

@ -8,7 +8,7 @@ let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {

55
pkgs/top-level/all-packages.nix
View File

@ -1055,7 +1055,7 @@ with pkgs;
inherit ({ inherit ({
mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix { mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {
inherit (darwin) cctools DarwinTools; inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10; antlr = antlr4_10;
icu = icu73; icu = icu73;
@ -1066,7 +1066,7 @@ with pkgs;
; ;
mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
inherit (darwin) cctools DarwinTools; inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10; antlr = antlr4_10;
icu = icu73; icu = icu73;
@ -3810,9 +3810,7 @@ with pkgs;
glyr = callPackage ../tools/audio/glyr { }; glyr = callPackage ../tools/audio/glyr { };
google-amber = callPackage ../tools/graphics/amber { google-amber = callPackage ../tools/graphics/amber { };
inherit (darwin) cctools;
};
hakrawler = callPackage ../tools/security/hakrawler { }; hakrawler = callPackage ../tools/security/hakrawler { };
@ -5445,7 +5443,6 @@ with pkgs;
hocr-tools = with python3Packages; toPythonApplication hocr-tools; hocr-tools = with python3Packages; toPythonApplication hocr-tools;
homepage-dashboard = callPackage ../servers/homepage-dashboard { homepage-dashboard = callPackage ../servers/homepage-dashboard {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) IOKit; inherit (darwin.apple_sdk.frameworks) IOKit;
}; };
@ -7912,7 +7909,7 @@ with pkgs;
lpd8editor = libsForQt5.callPackage ../applications/audio/lpd8editor {}; lpd8editor = libsForQt5.callPackage ../applications/audio/lpd8editor {};
lp_solve = callPackage ../applications/science/math/lp_solve { lp_solve = callPackage ../applications/science/math/lp_solve {
inherit (darwin) cctools autoSignDarwinBinariesHook; inherit (darwin) autoSignDarwinBinariesHook;
}; };
fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };
@ -10324,7 +10321,7 @@ with pkgs;
bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { }; bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { };
mailpit = callPackage ../servers/mail/mailpit { mailpit = callPackage ../servers/mail/mailpit {
libtool = if stdenv.isDarwin then darwin.cctools else libtool; libtool = if stdenv.isDarwin then cctools else libtool;
}; };
mailsend = callPackage ../tools/networking/mailsend { }; mailsend = callPackage ../tools/networking/mailsend { };
@ -12625,9 +12622,7 @@ with pkgs;
selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { }; selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { };
semantic-release = callPackage ../development/tools/semantic-release { semantic-release = callPackage ../development/tools/semantic-release { };
inherit (darwin) cctools;
};
semgrep = python3.pkgs.callPackage ../tools/security/semgrep { }; semgrep = python3.pkgs.callPackage ../tools/security/semgrep { };
semgrep-core = callPackage ../tools/security/semgrep/semgrep-core.nix { }; semgrep-core = callPackage ../tools/security/semgrep/semgrep-core.nix { };
@ -14236,7 +14231,6 @@ with pkgs;
unicorn = callPackage ../development/libraries/unicorn { unicorn = callPackage ../development/libraries/unicorn {
inherit (darwin.apple_sdk.frameworks) IOKit; inherit (darwin.apple_sdk.frameworks) IOKit;
inherit (darwin) cctools;
}; };
unittest-cpp = callPackage ../development/libraries/unittest-cpp { }; unittest-cpp = callPackage ../development/libraries/unittest-cpp { };
@ -15013,9 +15007,7 @@ with pkgs;
stdenv = gccStdenv; stdenv = gccStdenv;
}; };
chez = callPackage ../development/compilers/chez { chez = callPackage ../development/compilers/chez { };
inherit (darwin) cctools;
};
chez-racket = callPackage ../development/compilers/chez-racket { }; chez-racket = callPackage ../development/compilers/chez-racket { };
@ -17308,7 +17300,7 @@ with pkgs;
inherit (darwin) libobjc; inherit (darwin) libobjc;
}; };
defaultGemConfig = callPackage ../development/ruby-modules/gem-config { defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
inherit (darwin) DarwinTools cctools autoSignDarwinBinariesHook; inherit (darwin) DarwinTools autoSignDarwinBinariesHook;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
}; };
bundix = callPackage ../development/ruby-modules/bundix { }; bundix = callPackage ../development/ruby-modules/bundix { };
@ -17804,7 +17796,7 @@ with pkgs;
bazel = bazel_6; bazel = bazel_6;
bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {
inherit (darwin) cctools sigtool; inherit (darwin) sigtool;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk11_headless; buildJdk = jdk11_headless;
runJdk = jdk11_headless; runJdk = jdk11_headless;
@ -17815,7 +17807,7 @@ with pkgs;
}; };
bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {
inherit (darwin) cctools sigtool; inherit (darwin) sigtool;
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk11_headless; buildJdk = jdk11_headless;
runJdk = jdk11_headless; runJdk = jdk11_headless;
@ -17827,7 +17819,7 @@ with pkgs;
}; };
bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 { bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {
inherit (darwin) cctools sigtool; inherit (darwin) sigtool;
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit;
buildJdk = jdk17_headless; buildJdk = jdk17_headless;
runJdk = jdk17_headless; runJdk = jdk17_headless;
@ -19547,7 +19539,7 @@ with pkgs;
jhiccup = callPackage ../development/tools/java/jhiccup { }; jhiccup = callPackage ../development/tools/java/jhiccup { };
valgrind = callPackage ../development/tools/analysis/valgrind { valgrind = callPackage ../development/tools/analysis/valgrind {
inherit (buildPackages.darwin) xnu bootstrap_cmds cctools; inherit (buildPackages.darwin) xnu bootstrap_cmds;
}; };
valgrind-light = res.valgrind.override { gdb = null; }; valgrind-light = res.valgrind.override { gdb = null; };
@ -20825,7 +20817,6 @@ with pkgs;
gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection { gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection {
nixStoreDir = config.nix.storeDir or builtins.storeDir; nixStoreDir = config.nix.storeDir or builtins.storeDir;
inherit (darwin) cctools;
}; };
goocanvas = callPackage ../development/libraries/goocanvas { }; goocanvas = callPackage ../development/libraries/goocanvas { };
@ -20873,7 +20864,6 @@ with pkgs;
}; };
gpac = callPackage ../applications/video/gpac { gpac = callPackage ../applications/video/gpac {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) Carbon; inherit (darwin.apple_sdk.frameworks) Carbon;
}; };
@ -22867,7 +22857,7 @@ with pkgs;
lirc = callPackage ../development/libraries/lirc { }; lirc = callPackage ../development/libraries/lirc { };
liquid-dsp = callPackage ../development/libraries/liquid-dsp { liquid-dsp = callPackage ../development/libraries/liquid-dsp {
inherit (darwin) autoSignDarwinBinariesHook cctools; inherit (darwin) autoSignDarwinBinariesHook;
}; };
liquidfun = callPackage ../development/libraries/liquidfun { }; liquidfun = callPackage ../development/libraries/liquidfun { };
@ -25832,14 +25822,12 @@ with pkgs;
mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix { mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix {
sasl = cyrus_sasl; sasl = cyrus_sasl;
boost = boost179.override { enableShared = false; }; boost = boost179.override { enableShared = false; };
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
}; };
mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix { mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix {
sasl = cyrus_sasl; sasl = cyrus_sasl;
boost = boost178.override { enableShared = false; }; boost = boost178.override { enableShared = false; };
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
stdenv = if stdenv.isDarwin then stdenv = if stdenv.isDarwin then
darwin.apple_sdk_11_0.stdenv.override (old: { darwin.apple_sdk_11_0.stdenv.override (old: {
@ -25863,7 +25851,7 @@ with pkgs;
influxdb2 = callPackage ../servers/nosql/influxdb2/combined.nix { }; influxdb2 = callPackage ../servers/nosql/influxdb2/combined.nix { };
mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin) developer_cmds DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost177; # Configure checks for specific version. boost = boost177; # Configure checks for specific version.
icu = icu69; icu = icu69;
@ -26146,7 +26134,7 @@ with pkgs;
rethinkdb = callPackage ../servers/nosql/rethinkdb { rethinkdb = callPackage ../servers/nosql/rethinkdb {
stdenv = clangStdenv; stdenv = clangStdenv;
libtool = darwin.cctools; libtool = cctools;
protobuf = protobuf_21; protobuf = protobuf_21;
}; };
@ -28729,7 +28717,7 @@ with pkgs;
session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { }; session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { };
shaderc = callPackage ../development/compilers/shaderc { shaderc = callPackage ../development/compilers/shaderc {
inherit (darwin) autoSignDarwinBinariesHook cctools; inherit (darwin) autoSignDarwinBinariesHook;
}; };
shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
@ -32162,7 +32150,7 @@ with pkgs;
mac = callPackage ../development/libraries/mac { }; mac = callPackage ../development/libraries/mac { };
macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; }; macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { };
magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
@ -34810,14 +34798,12 @@ with pkgs;
openvscode-server = callPackage ../servers/openvscode-server { openvscode-server = callPackage ../servers/openvscode-server {
nodejs = nodejs_18; nodejs = nodejs_18;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
inherit (darwin) cctools;
inherit (nodePackages) node-gyp; inherit (nodePackages) node-gyp;
}; };
code-server = callPackage ../servers/code-server { code-server = callPackage ../servers/code-server {
nodejs = nodejs_18; nodejs = nodejs_18;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security;
inherit (darwin) cctools;
inherit (nodePackages) node-gyp; inherit (nodePackages) node-gyp;
}; };
@ -36207,9 +36193,7 @@ with pkgs;
garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
gargoyle = callPackage ../games/gargoyle { gargoyle = callPackage ../games/gargoyle { };
inherit (darwin) cctools;
};
gav = callPackage ../games/gav { }; gav = callPackage ../games/gav { };
@ -36675,7 +36659,6 @@ with pkgs;
scid-vs-pc = callPackage ../games/scid-vs-pc { }; scid-vs-pc = callPackage ../games/scid-vs-pc { };
scummvm = callPackage ../games/scummvm { scummvm = callPackage ../games/scummvm {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit; inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit;
}; };
@ -40069,7 +40052,7 @@ with pkgs;
check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { }; check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { };
ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { };
vdr = callPackage ../applications/video/vdr { }; vdr = callPackage ../applications/video/vdr { };
vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { }); vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { });

10
pkgs/top-level/python-packages.nix
View File

@ -6159,7 +6159,6 @@ self: super: with self; {
}; };
jaxlib-build = callPackage ../development/python-modules/jaxlib rec { jaxlib-build = callPackage ../development/python-modules/jaxlib rec {
inherit (pkgs.darwin) cctools;
# Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
inherit (pkgs.config) cudaSupport; inherit (pkgs.config) cudaSupport;
IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit;
@ -7660,9 +7659,7 @@ self: super: with self; {
minio = callPackage ../development/python-modules/minio { }; minio = callPackage ../development/python-modules/minio { };
miniupnpc = callPackage ../development/python-modules/miniupnpc { miniupnpc = callPackage ../development/python-modules/miniupnpc { };
inherit (pkgs.darwin) cctools;
};
mip = callPackage ../development/python-modules/mip { }; mip = callPackage ../development/python-modules/mip { };
@ -15208,7 +15205,6 @@ self: super: with self; {
}; };
in in
callPackage ../development/python-modules/tensorflow { callPackage ../development/python-modules/tensorflow {
inherit (pkgs.darwin) cctools;
inherit (pkgs.config) cudaSupport; inherit (pkgs.config) cudaSupport;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
flatbuffers-core = pkgs.flatbuffers; flatbuffers-core = pkgs.flatbuffers;
@ -15235,9 +15231,7 @@ self: super: with self; {
tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { }; tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { };
tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
inherit (pkgs.darwin) cctools;
};
tensorflow = self.tensorflow-build; tensorflow = self.tensorflow-build;