mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-28 15:54:32 +00:00
termscp: migrate to new apple sdk structure
This commit is contained in:
parent
1b4a53797f
commit
7feb128ce9
@ -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
|
||||
];
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user