Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[staging] various: remove code for macOS < 11 #370999

Merged
merged 4 commits into from
Jan 5, 2025
Merged

[staging] various: remove code for macOS < 11 #370999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42522c0
gnumake{,42}: remove code for macOS < 11
emilazy Oct 5, 2024
f43d8ae
tk-{8_5,8_6,9_0}: remove code for macOS < 11
emilazy Oct 5, 2024
b01bac1
libepoxy: remove code for macOS < 11
emilazy Oct 5, 2024
31b249a
Revert "inetutils: fix build on x86_64-darwin"
emilazy Oct 5, 2024
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
12 changes: 1 addition & 11 deletions pkgs/by-name/gn/gnumake42/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
buildInputs = lib.optionals guileSupport [ guile ];

configureFlags =
lib.optional guileSupport "--with-guile"

# Make uses this test to decide whether it should keep track of
# subseconds. Apple made this possible with APFS and macOS 10.13.
# However, we still support macOS 10.11 and 10.12. Binaries built
# in Nixpkgs will be unable to use futimens to set mtime less than
# a second. So, tell Make to ignore nanoseconds in mtime here by
# overriding the autoconf test for the struct.
# See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no";
configureFlags = lib.optional guileSupport "--with-guile";

outputs = [
"out"
Expand Down
6 changes: 0 additions & 6 deletions pkgs/by-name/in/inetutils/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ stdenv.mkDerivation rec {
libxcrypt
];

env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
# This is a temporary workaround for missing headers in the 10.12 SDK to avoid a mass rebuild.
# A commit to revert this change will be included in the fix PR targeting staging.
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
};

# Don't use help2man if cross-compiling
# https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html
# https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44
Expand Down
4 changes: 0 additions & 4 deletions pkgs/development/libraries/libepoxy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace test/meson.build \
--replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
substituteInPlace test/meson.build \
--replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," ""
'';

outputs = [ "out" "dev" ];
Expand Down
12 changes: 2 additions & 10 deletions pkgs/development/libraries/tk/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, src, pkg-config, tcl, libXft, zip, zlib, patches ? []
, enableAqua ? stdenv.hostPlatform.isDarwin, darwin
, enableAqua ? stdenv.hostPlatform.isDarwin
, ... }:

tcl.mkTclDerivation {
Expand All @@ -21,10 +21,6 @@ tcl.mkTclDerivation {
for file in $(find library/demos/. -type f ! -name "*.*"); do
substituteInPlace $file --replace "exec wish" "exec $out/bin/wish"
done
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") ''
substituteInPlace unix/configure* \
--replace-fail " -weak_framework UniformTypeIdentifiers" ""
'';

postInstall = ''
Expand Down Expand Up @@ -62,11 +58,7 @@ tcl.mkTclDerivation {

propagatedBuildInputs = [
libXft
] ++ lib.optionals enableAqua ([
darwin.apple_sdk.frameworks.Cocoa
] ++ lib.optionals (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [
darwin.apple_sdk.frameworks.UniformTypeIdentifiers
]);
];

enableParallelBuilding = true;

Expand Down
12 changes: 1 addition & 11 deletions pkgs/development/tools/build-managers/gnumake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,7 @@ stdenv.mkDerivation rec {
];
buildInputs = lib.optionals guileEnabled [ guile ];

configureFlags =
lib.optional guileEnabled "--with-guile"

# Make uses this test to decide whether it should keep track of
# subseconds. Apple made this possible with APFS and macOS 10.13.
# However, we still support macOS 10.11 and 10.12. Binaries built
# in Nixpkgs will be unable to use futimens to set mtime less than
# a second. So, tell Make to ignore nanoseconds in mtime here by
# overriding the autoconf test for the struct.
# See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no";
configureFlags = lib.optional guileEnabled "--with-guile";

outputs = [
"out"
Expand Down
Loading