Skip to content

Commit

Permalink
termscp: migrate to new apple sdk structure
Browse files Browse the repository at this point in the history
  • Loading branch information
gepbird committed Nov 13, 2024
1 parent ad0cbe7 commit 7fab0b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 27 deletions.
29 changes: 5 additions & 24 deletions pkgs/tools/networking/termscp/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
{
lib,
stdenv,
dbus,
fetchFromGitHub,
openssl,
pkg-config,
rustPlatform,
AppKit,
Cocoa,
Foundation,
Security,
samba,
versionCheckHook,
nix-update-script,
Expand All @@ -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
];
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5531,9 +5531,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;
Expand Down

0 comments on commit 7fab0b0

Please sign in to comment.