treewide: unpin apple-sdk_11 pt 6 (#370477)

NixOS · Jan 3, 2025 · 4200b91 · 4200b91
2 parents 7491cae + caade83
commit 4200b91
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 104 deletions.
diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix
@@ -21,7 +21,6 @@
   python3,
   asciidoctor,
   libgit2,
-  apple-sdk_11,
   wrapGAppsHook3,
   installShellFiles,
   buildPlugins ? true,
@@ -46,28 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      zlib
-      libjpeg
-      wxGTK32
-      libxml2
-      libsigcxx
-      libpng
-      openal
-      libvorbis
-      eigen
-      ftgl
-      freetype
-      glew
-      glib
-      libgit2
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    zlib
+    libjpeg
+    wxGTK32
+    libxml2
+    libsigcxx
+    libpng
+    openal
+    libvorbis
+    eigen
+    ftgl
+    freetype
+    glew
+    glib
+    libgit2
+    python3
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
 
   doCheck = true;
 

diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix
@@ -1,5 +1,4 @@
 {
-  apple-sdk_11,
   fetchFromGitHub,
   fetchpatch, # Delete at next version bump.
   lib,
@@ -53,7 +52,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libgit2
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   installPhase = ''
     runHook preInstall

diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix
@@ -13,7 +13,6 @@
   freetype,
   alsa-lib,
   libjack2,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -49,18 +48,16 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXext
-      libXcursor
-      libXinerama
-      libXrandr
-      freetype
-      alsa-lib
-      libjack2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXext
+    libXcursor
+    libXinerama
+    libXrandr
+    freetype
+    alsa-lib
+    libjack2
+  ];
 
   # JUCE insists on only dlopen'ing these
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [

diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
@@ -15,7 +15,6 @@
   libsoup_2_4,
   webkitgtk_4_0,
   gst_all_1,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -51,17 +50,15 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      openssl
-      libsoup_2_4
-      webkitgtk_4_0
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-good
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+    libsoup_2_4
+    webkitgtk_4_0
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-good
+  ];
 
   doCheck = false; # many scoring tests fail
 

diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
@@ -19,8 +19,6 @@
   wxGTK32,
   makeWrapper,
   stdenv,
-  apple-sdk_11,
-  darwinMinVersionHook,
   waylandSupport ? false,
   x11Support ? stdenv.hostPlatform.isLinux,
   testers,
@@ -81,10 +79,6 @@ rustPlatform.buildRustPackage rec {
       libnotify
       libxkbcommon
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.13")
-    ]
     ++ lib.optionals waylandSupport [
       wl-clipboard
     ]

diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix
@@ -9,8 +9,6 @@
   qt6Packages,
   febio,
   glew,
-  apple-sdk_11,
-  darwinMinVersionHook,
   fetchpatch,
   sshSupport ? true,
   openssl,
@@ -74,11 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional tetgenSupport tetgen
     ++ lib.optional ffmpegSupport ffmpeg
-    ++ lib.optional dicomSupport dcmtk
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.15")
-    ];
+    ++ lib.optional dicomSupport dcmtk;
 
   meta = {
     description = "FEBio Suite Solver";

diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   fetchpatch2,
   replaceVars,
-  apple-sdk_11,
   cmake,
-  darwinMinVersionHook,
   ninja,
   zlib,
   mklSupport ? true,
@@ -48,13 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs =
-    [ zlib ]
-    ++ lib.optionals mklSupport [ mkl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.15")
-    ];
+  buildInputs = [ zlib ] ++ lib.optionals mklSupport [ mkl ];
 
   meta = {
     description = "FEBio Suite Solver";

diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   testers,
   zig_0_11,
-  apple-sdk_11,
 }:
 let
   zig = zig_0_11;
@@ -22,8 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ zig.hook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = {

diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
@@ -13,7 +13,6 @@
   libXcursor,
   freetype,
   alsa-lib,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -53,17 +52,15 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXrandr
-      libXinerama
-      libXext
-      libXcursor
-      freetype
-      alsa-lib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXrandr
+    libXinerama
+    libXext
+    libXcursor
+    freetype
+    alsa-lib
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)

diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix
@@ -17,7 +17,6 @@
   mupdf,
   fontconfig,
   freetype,
-  apple-sdk_11,
 }:
 
 buildGoModule rec {
@@ -88,9 +87,6 @@ buildGoModule rec {
       libXxf86vm
       fontconfig
       freetype
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh

diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix
@@ -17,7 +17,6 @@
 
   openssl,
   webkitgtk_4_1,
-  apple-sdk_11,
 
   versionCheckHook,
   nix-update-script,
@@ -71,8 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     [ openssl ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       webkitgtk_4_1
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+    ];
 
   env.OPENSSL_NO_VENDOR = true;
 

diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   cmake,
   fetchFromGitHub,
   nix-update-script,
@@ -20,8 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   passthru = {
     updateScript = nix-update-script { };
   };

diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   zig_0_13,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,12 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig_0_13.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    # The package failed to build on x86_64-darwin because the default was the 10.12 SDK
-    # Once the default on all platforms has been raised to the 11.0 SDK or higher, this can be removed.
-    apple-sdk_11
-  ];
-
   postPatch = ''
     substituteInPlace build.zig \
       --replace-fail 'b.run(&.{ "git", "describe", "--tags", "--always" })' '"${finalAttrs.src.rev}"'