From cbfaf563277ff6d3c856ed4f8a952ba51cb01b87 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 00:53:22 -0500 Subject: [PATCH] diesel-cli: migrate to new darwin SDK pattern https://github.com/NixOS/nixpkgs/issues/354146 (cherry picked from commit e032f3a2586281b31dd479803bbaa9fe95528370) --- pkgs/by-name/di/diesel-cli/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 55df1b18be230..37b0afc49ebb0 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -1,24 +1,24 @@ { lib, stdenv, + diesel-cli, fetchCrate, - rustPlatform, installShellFiles, - darwin, libiconv, libmysqlclient, nix-update-script, openssl, pkg-config, postgresql, + rustPlatform, sqlite, testers, zlib, - diesel-cli, sqliteSupport ? true, postgresqlSupport ? true, mysqlSupport ? true, }: + assert lib.assertMsg (lib.elem true [ postgresqlSupport mysqlSupport @@ -44,8 +44,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security - ++ lib.optional (stdenv.hostPlatform.isDarwin && mysqlSupport) libiconv ++ lib.optional sqliteSupport sqlite ++ lib.optional postgresqlSupport postgresql ++ lib.optionals mysqlSupport [