[Backport release-24.11] various packages: use new darwin sdk pattern (…

…#361784)
NixOS · Dec 4, 2024 · 0dad3a7 · 0dad3a7
2 parents 2d5ba66 + 2ea2b18
commit 0dad3a7
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 52 deletions.
diff --git a/pkgs/by-name/ca/cargo-feature/package.nix b/pkgs/by-name/ca/cargo-feature/package.nix
@@ -2,8 +2,6 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  stdenv,
-  libiconv,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -19,8 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
-
   checkFlags = [
     # The following tests require empty CARGO_BUILD_TARGET env variable, but we
     # set it ever since https://github.com/NixOS/nixpkgs/pull/298108.

diff --git a/pkgs/by-name/ca/cargo-fuzz/package.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-fuzz";
@@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
-
   doCheck = false;
 
   meta = with lib; {

diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix
@@ -2,8 +2,6 @@
 , rustPlatform
 , fetchFromGitHub
 , nix-update-script
-, stdenv
-, libiconv
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -19,8 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
   passthru = {
     updateScript = nix-update-script { };
   };

diff --git a/pkgs/by-name/ca/cargo-unfmt/package.nix b/pkgs/by-name/ca/cargo-unfmt/package.nix
@@ -1,9 +1,6 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , rustPlatform
-, darwin
-, libiconv
 }:
 
 rustPlatform.buildRustPackage {
@@ -19,8 +16,6 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-mMeHTYCUIZR3jVvTxfyH4I9wGfUdCWcyn9djnksAY8k=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
-
   # Doc tests are broken on 0.3.3
   doCheck = false;
 

diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
@@ -1,14 +1,11 @@
 { lib
 , gitSupport ? true
-, stdenv
 , fetchFromGitHub
 , rustPlatform
 , cmake
 , pandoc
 , pkg-config
 , zlib
-, darwin
-, libiconv
 , installShellFiles
   # once eza upstream gets support for setting up a compatibility symlink for exa, we should change
   # the handling here from postInstall to passing the required argument to the builder.
@@ -29,8 +26,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-k9zSchHFF2t30ca15eadEhnO0aFH5KIc1i0uuBKZZtc=";
 
   nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
-  buildInputs = [ zlib ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
+  buildInputs = [ zlib ];
 
   buildNoDefaultFeatures = true;
   buildFeatures = lib.optional gitSupport "git";

diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix
@@ -8,7 +8,6 @@
 , dbus
 , testers
 , openpgp-card-tools
-, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -27,10 +26,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ];
 
-  buildInputs = [ pcsclite dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.PCSC
-    darwin.apple_sdk.frameworks.Security
-  ];
+  buildInputs = [ pcsclite dbus ];
 
   passthru = {
     tests.version = testers.testVersion {

diff --git a/pkgs/by-name/os/ostree-rs-ext/package.nix b/pkgs/by-name/os/ostree-rs-ext/package.nix
@@ -8,7 +8,6 @@
 , zlib
 , ostree
 , stdenv
-, darwin
 , util-linux
 , skopeo
 , gnutar
@@ -44,9 +43,6 @@ rustPlatform.buildRustPackage rec {
     openssl
     zlib
     ostree
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.CoreFoundation
-    darwin.apple_sdk.frameworks.Security
   ];
 
   checkFlags = [

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
@@ -3,9 +3,6 @@
 , fetchFromGitHub
 , pkg-config
 , openssl
-, stdenv
-, libiconv
-, darwin
 , nix-update-script
 }:
 
@@ -23,12 +20,8 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-OjA0OKotAdRLGRkl8n3Gn2+Z8JVcGjQYHtOszWnnFdM=";
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      darwin.apple_sdk.frameworks.Security
-      darwin.apple_sdk.frameworks.CoreServices
-    ];
+
+  buildInputs = [ openssl ];
 
   passthru.updateScript = nix-update-script { };
 

diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
@@ -6,7 +6,6 @@
 , nettle
 , openssl
 , sqlite
-, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,9 +30,6 @@ rustPlatform.buildRustPackage rec {
     nettle
     openssl
     sqlite
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-    darwin.apple_sdk.frameworks.SystemConfiguration
   ];
 
   # gpgconf: error creating socket directory

diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
@@ -9,7 +8,6 @@
   rustc,
   setuptools,
   setuptools-rust,
-  libiconv,
 }:
 
 buildPythonPackage rec {
@@ -42,8 +40,6 @@ buildPythonPackage rec {
     cargo
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
   # has no tests
   doCheck = false;
 

diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
@@ -6,7 +6,6 @@
 , pkg-config
 , protobuf
 , cacert
-, Security
 , garage
 , nixosTests
 }:
@@ -35,7 +34,7 @@ let
 
     buildInputs = [
       openssl
-    ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
+    ];
 
     checkInputs = [
       cacert

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -3522,9 +3522,7 @@ with pkgs;
 
   gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
 
-  inherit (callPackages ../tools/filesystems/garage {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  })
+  inherit (callPackages ../tools/filesystems/garage { })
     garage
       garage_0_8 garage_0_9
       garage_0_8_7 garage_0_9_4