lol

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

authored by

Emily and committed by
GitHub
59d3f18a 39b88949

+4 -42
+1 -11
pkgs/by-name/gn/gnumake42/package.nix
··· 33 33 nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; 34 34 buildInputs = lib.optionals guileSupport [ guile ]; 35 35 36 - configureFlags = 37 - lib.optional guileSupport "--with-guile" 38 - 39 - # Make uses this test to decide whether it should keep track of 40 - # subseconds. Apple made this possible with APFS and macOS 10.13. 41 - # However, we still support macOS 10.11 and 10.12. Binaries built 42 - # in Nixpkgs will be unable to use futimens to set mtime less than 43 - # a second. So, tell Make to ignore nanoseconds in mtime here by 44 - # overriding the autoconf test for the struct. 45 - # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. 46 - ++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no"; 36 + configureFlags = lib.optional guileSupport "--with-guile"; 47 37 48 38 outputs = [ 49 39 "out"
-6
pkgs/by-name/in/inetutils/package.nix
··· 39 39 libxcrypt 40 40 ]; 41 41 42 - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { 43 - # This is a temporary workaround for missing headers in the 10.12 SDK to avoid a mass rebuild. 44 - # A commit to revert this change will be included in the fix PR targeting staging. 45 - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; 46 - }; 47 - 48 42 # Don't use help2man if cross-compiling 49 43 # https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html 50 44 # https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44
-4
pkgs/development/libraries/libepoxy/default.nix
··· 37 37 + lib.optionalString stdenv.hostPlatform.isDarwin '' 38 38 substituteInPlace test/meson.build \ 39 39 --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" 40 - '' 41 - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' 42 - substituteInPlace test/meson.build \ 43 - --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" 44 40 ''; 45 41 46 42 outputs = [ "out" "dev" ];
+2 -10
pkgs/development/libraries/tk/generic.nix
··· 1 1 { stdenv, lib, src, pkg-config, tcl, libXft, zip, zlib, patches ? [] 2 - , enableAqua ? stdenv.hostPlatform.isDarwin, darwin 2 + , enableAqua ? stdenv.hostPlatform.isDarwin 3 3 , ... }: 4 4 5 5 tcl.mkTclDerivation { ··· 21 21 for file in $(find library/demos/. -type f ! -name "*.*"); do 22 22 substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" 23 23 done 24 - '' 25 - + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' 26 - substituteInPlace unix/configure* \ 27 - --replace-fail " -weak_framework UniformTypeIdentifiers" "" 28 24 ''; 29 25 30 26 postInstall = '' ··· 62 58 63 59 propagatedBuildInputs = [ 64 60 libXft 65 - ] ++ lib.optionals enableAqua ([ 66 - darwin.apple_sdk.frameworks.Cocoa 67 - ] ++ lib.optionals (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [ 68 - darwin.apple_sdk.frameworks.UniformTypeIdentifiers 69 - ]); 61 + ]; 70 62 71 63 enableParallelBuilding = true; 72 64
+1 -11
pkgs/development/tools/build-managers/gnumake/default.nix
··· 43 43 ]; 44 44 buildInputs = lib.optionals guileEnabled [ guile ]; 45 45 46 - configureFlags = 47 - lib.optional guileEnabled "--with-guile" 48 - 49 - # Make uses this test to decide whether it should keep track of 50 - # subseconds. Apple made this possible with APFS and macOS 10.13. 51 - # However, we still support macOS 10.11 and 10.12. Binaries built 52 - # in Nixpkgs will be unable to use futimens to set mtime less than 53 - # a second. So, tell Make to ignore nanoseconds in mtime here by 54 - # overriding the autoconf test for the struct. 55 - # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. 56 - ++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no"; 46 + configureFlags = lib.optional guileEnabled "--with-guile"; 57 47 58 48 outputs = [ 59 49 "out"