Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions pkgs/by-name/ng/nghttp2/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,6 @@ stdenv.mkDerivation rec {
(lib.enableFeature enableHttp3 "http3")
];

env.NIX_CFLAGS_COMPILE = toString (
lib.optionals
(stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13")
[
"-faligned-allocation"
]
);

# Unit tests require CUnit and setting TZDIR environment variable
doCheck = enableTests;
nativeCheckInputs = lib.optionals (enableTests) [
Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@ qtModule {
qtbase
qtquick3d
];
env.NIX_CFLAGS_COMPILE = lib.optionalString (
stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
) "-faligned-allocation";
meta.mainProgram = "cooker";
}
23 changes: 0 additions & 23 deletions pkgs/development/python-modules/pybind11/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,6 @@ let
pythonSitePackages = "${python}/${python.sitePackages}";
};
} ./setup-hook.sh;

# clang 16 defaults to C++17, which results in the use of aligned allocations by pybind11.
# libc++ supports aligned allocations via `posix_memalign`, which is available since 10.6,
# but clang has a check hard-coded requiring 10.13 because that’s when Apple first shipped a
# support for C++17 aligned allocations on macOS.
# Tell clang we’re targeting 10.13 on x86_64-darwin while continuing to use the default SDK.
stdenv' =
if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
python.stdenv.override (oldStdenv: {
buildPlatform = oldStdenv.buildPlatform // {
darwinMinVersion = "10.13";
};
targetPlatform = oldStdenv.targetPlatform // {
darwinMinVersion = "10.13";
};
hostPlatform = oldStdenv.hostPlatform // {
darwinMinVersion = "10.13";
};
})
else
python.stdenv;
in
buildPythonPackage rec {
pname = "pybind11";
Expand All @@ -69,8 +48,6 @@ buildPythonPackage rec {
buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ];
propagatedNativeBuildInputs = [ setupHook ];

stdenv = stdenv';

dontUseCmakeBuildDir = true;

# Don't build tests if not needed, read the doInstallCheck value at runtime
Expand Down
4 changes: 0 additions & 4 deletions pkgs/development/web/nodejs/nodejs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,6 @@ let
# Note: do not set TERM=dumb environment variable globally, it is used in
# test-ci-js test suite to skip tests that otherwise run fine.
NINJA = "TERM=dumb ninja";
} // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
# Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin.
# Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+.
NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300 -Wno-macro-redefined";
};

# NB: technically, we do not need bash in build inputs since all scripts are
Expand Down
Loading