termscp: migrate to new apple sdk structure

This commit is contained in:
Gutyina Gergő 2024-11-12 20:38:14 +01:00
parent 1b4a53797f
commit 7feb128ce9
No known key found for this signature in database
2 changed files with 6 additions and 27 deletions

View File

@ -1,15 +1,10 @@
{
lib,
stdenv,
dbus,
fetchFromGitHub,
openssl,
pkg-config,
rustPlatform,
AppKit,
Cocoa,
Foundation,
Security,
samba,
versionCheckHook,
nix-update-script,
@ -32,29 +27,15 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs =
[
dbus
openssl
samba
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Cocoa
Foundation
Security
];
buildInputs = [
dbus
openssl
samba
];
# Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR = 1;
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.hostPlatform.isDarwin [
"-framework"
"AppKit"
]
);
nativeInstallCheckInputs = [
versionCheckHook
];

View File

@ -5469,9 +5469,7 @@ with pkgs;
pythonPackages = python3Packages;
};
termscp = callPackage ../tools/networking/termscp {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation Security;
};
termscp = callPackage ../tools/networking/termscp { };
texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;