treewide: remove usage of deprecated apple_sdk framework stubs

They are not doing anything right now. This is in preparation for their
complete removal from the tree.

Note: several changes that affect the derivation inputs (e.g. removal of
references to stub paths in build instructions) were left out. They will
be cleaned up the next iteration and will require special care.

Note: this PR is a result of a mix of ugly regex (not AST) based
automation and some manual labor. For reference, the regex automation
part was hacked in: https://github.com/booxter/nix-clean-apple_sdk

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
This commit is contained in:
Ihar Hrachyshka 2025-04-14 09:29:14 -04:00
parent 5ec4cb1365
commit dd0f03a56c
1173 changed files with 2734 additions and 10513 deletions

View file

@ -377,14 +377,7 @@ let
inputs = inputs =
basePackages basePackages
++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ];
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
CoreFoundation
CoreServices
]
);
# define shell startup command # define shell startup command
hooks = '' hooks = ''

View file

@ -2,7 +2,6 @@
fetchurl, fetchurl,
lib, lib,
stdenv, stdenv,
IOKit ? null,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -19,8 +18,6 @@ stdenv.mkDerivation rec {
"INSTALL=install" "INSTALL=install"
]; ];
buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit;
meta = with lib; { meta = with lib; {
homepage = "http://linukz.org/cd-discid.shtml"; homepage = "http://linukz.org/cd-discid.shtml";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

View file

@ -9,13 +9,6 @@
which, which,
DarwinTools, DarwinTools,
xcbuild, xcbuild,
AppKit,
Carbon,
CoreAudio,
CoreMIDI,
CoreServices,
Kernel,
MultitouchSupport,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -38,18 +31,7 @@ stdenv.mkDerivation rec {
xcbuild xcbuild
]; ];
buildInputs = buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
[ libsndfile ]
++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Carbon
CoreAudio
CoreMIDI
CoreServices
Kernel
MultitouchSupport
];
patches = [ ./darwin-limits.patch ]; patches = [ ./darwin-limits.patch ];

View file

@ -6,9 +6,6 @@
ncurses, ncurses,
pkg-config, pkg-config,
libiconv, libiconv,
CoreAudio,
AudioUnit,
VideoToolbox,
alsaSupport ? stdenv.hostPlatform.isLinux, alsaSupport ? stdenv.hostPlatform.isLinux,
alsa-lib ? null, alsa-lib ? null,
@ -152,9 +149,6 @@ stdenv.mkDerivation rec {
[ ncurses ] [ ncurses ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv libiconv
CoreAudio
AudioUnit
VideoToolbox
] ]
++ lib.flatten (lib.concatMap (a: a.deps) opts); ++ lib.flatten (lib.concatMap (a: a.deps) opts);

View file

@ -9,10 +9,6 @@
bison, bison,
boost, boost,
gettext, gettext,
Accelerate,
AudioUnit,
CoreAudio,
CoreMIDI,
portaudio, portaudio,
alsa-lib ? null, alsa-lib ? null,
libpulseaudio ? null, libpulseaudio ? null,
@ -61,10 +57,6 @@ stdenv.mkDerivation {
boost boost
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
Accelerate
AudioUnit
CoreAudio
CoreMIDI
portaudio portaudio
] ]
++ lib.optionals stdenv.hostPlatform.isLinux ( ++ lib.optionals stdenv.hostPlatform.isLinux (

View file

@ -17,9 +17,6 @@
pcaudiolib, pcaudiolib,
sonicSupport ? true, sonicSupport ? true,
sonic, sonic,
CoreAudio,
AudioToolbox,
AudioUnit,
alsa-plugins, alsa-plugins,
makeWrapper, makeWrapper,
}: }:
@ -63,12 +60,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
lib.optional mbrolaSupport mbrola lib.optional mbrolaSupport mbrola
++ lib.optional pcaudiolibSupport pcaudiolib ++ lib.optional pcaudiolibSupport pcaudiolib
++ lib.optional sonicSupport sonic ++ lib.optional sonicSupport sonic;
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreAudio
AudioToolbox
AudioUnit
];
# touch ChangeLog to avoid below error on darwin: # touch ChangeLog to avoid below error on darwin:
# Makefile.am: error: required file './ChangeLog.md' not found # Makefile.am: error: required file './ChangeLog.md' not found

View file

@ -7,10 +7,6 @@
alsa-lib, alsa-lib,
SDL2, SDL2,
libiconv, libiconv,
CoreAudio,
CoreMIDI,
CoreServices,
Cocoa,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -30,10 +26,6 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv libiconv
CoreAudio
CoreMIDI
CoreServices
Cocoa
]; ];
passthru.tests = { passthru.tests = {

View file

@ -16,7 +16,6 @@
libicns, libicns,
yaml-cpp, yaml-cpp,
makeWrapper, makeWrapper,
Cocoa,
includeDemo ? true, includeDemo ? true,
}: }:
@ -54,7 +53,6 @@ stdenv.mkDerivation rec {
alsa-lib alsa-lib
udev udev
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]
++ lib.optional jackaudioSupport libjack2; ++ lib.optional jackaudioSupport libjack2;
cmakeFlags = cmakeFlags =

View file

@ -7,9 +7,6 @@
openssl, openssl,
libiconv, libiconv,
sqlite, sqlite,
Security,
SystemConfiguration,
CoreFoundation,
installShellFiles, installShellFiles,
asciidoctor, asciidoctor,
}: }:
@ -41,9 +38,6 @@ rustPlatform.buildRustPackage rec {
if stdenv.hostPlatform.isDarwin then if stdenv.hostPlatform.isDarwin then
[ [
libiconv libiconv
Security
SystemConfiguration
CoreFoundation
] ]
else else
[ [

View file

@ -5,7 +5,6 @@
SDL2, SDL2,
python3, python3,
jack2, jack2,
Foundation,
alsa-lib, alsa-lib,
pkg-config, pkg-config,
}: }:
@ -31,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = buildInputs =
[ SDL2 ] [ SDL2 ]
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib
++ lib.optional stdenv.hostPlatform.isDarwin Foundation
++ lib.optional stdenv.hostPlatform.isLinux jack2; ++ lib.optional stdenv.hostPlatform.isLinux jack2;
preBuild = '' preBuild = ''

View file

@ -8,7 +8,6 @@
libXrandr, libXrandr,
pkg-config, pkg-config,
python3, python3,
Cocoa,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "master_me"; pname = "master_me";
@ -28,7 +27,6 @@ stdenv.mkDerivation rec {
libGL libGL
python3 python3
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
libX11 libX11
libXext libXext

View file

@ -12,13 +12,6 @@
libXcursor, libXcursor,
gtk3, gtk3,
ffmpeg-full, ffmpeg-full,
AppKit,
Carbon,
Cocoa,
CoreAudio,
CoreMIDI,
CoreServices,
Kernel,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -49,15 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
libXinerama libXinerama
libXcursor libXcursor
gtk3 gtk3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Carbon
Cocoa
CoreAudio
CoreMIDI
CoreServices
Kernel
]; ];
installPhase = installPhase =

View file

@ -4,8 +4,6 @@
rustPlatform, rustPlatform,
stdenv, stdenv,
libusb1, libusb1,
AppKit,
IOKit,
pkg-config, pkg-config,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -24,12 +22,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ]; cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ];
buildInputs = buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ];
lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
IOKit
];
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];

View file

@ -9,8 +9,6 @@
libX11, libX11,
libXau, libXau,
libXdmcp, libXdmcp,
Carbon,
Cocoa,
cppunit, cppunit,
}: }:
@ -61,10 +59,6 @@ stdenv.mkDerivation {
libX11 libX11
libXau libXau
libXdmcp libXdmcp
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
]; ];
checkInputs = [ checkInputs = [

View file

@ -11,7 +11,6 @@
popt, popt,
libtool, libtool,
libiconv, libiconv,
CoreServices,
# Sound sub-systems # Sound sub-systems
alsaSupport ? (!stdenv.hostPlatform.isDarwin), alsaSupport ? (!stdenv.hostPlatform.isDarwin),
alsa-lib, alsa-lib,
@ -125,7 +124,6 @@ stdenv.mkDerivation {
++ lib.optional samplerateSupport libsamplerate ++ lib.optional samplerateSupport libsamplerate
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv libiconv
CoreServices
]; ];
configureFlags = [ configureFlags = [

View file

@ -10,8 +10,6 @@
withPulse ? stdenv.hostPlatform.isLinux, withPulse ? stdenv.hostPlatform.isLinux,
libpulseaudio, libpulseaudio,
withCoreAudio ? stdenv.hostPlatform.isDarwin, withCoreAudio ? stdenv.hostPlatform.isDarwin,
AudioUnit,
AudioToolbox,
withJack ? stdenv.hostPlatform.isUnix, withJack ? stdenv.hostPlatform.isUnix,
jack, jack,
withConplay ? !stdenv.hostPlatform.isWindows, withConplay ? !stdenv.hostPlatform.isWindows,
@ -45,8 +43,6 @@ stdenv.mkDerivation rec {
++ lib.optionals withAlsa [ alsa-lib ] ++ lib.optionals withAlsa [ alsa-lib ]
++ lib.optionals withPulse [ libpulseaudio ] ++ lib.optionals withPulse [ libpulseaudio ]
++ lib.optionals withCoreAudio [ ++ lib.optionals withCoreAudio [
AudioUnit
AudioToolbox
] ]
++ lib.optionals withJack [ jack ] ++ lib.optionals withJack [ jack ]
); );

View file

@ -5,7 +5,6 @@
rustPlatform, rustPlatform,
pkg-config, pkg-config,
wrapGAppsHook3, wrapGAppsHook3,
CoreServices,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec {
pkg-config pkg-config
wrapGAppsHook3 wrapGAppsHook3
]; ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices;
preConfigure = '' preConfigure = ''
substituteInPlace lib/utils.rs \ substituteInPlace lib/utils.rs \

View file

@ -9,9 +9,7 @@
unstableGitUpdater, unstableGitUpdater,
openssl, openssl,
pkg-config, pkg-config,
stdenv,
yt-dlp, yt-dlp,
Security,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "parrot"; pname = "parrot";
@ -36,7 +34,7 @@ rustPlatform.buildRustPackage {
buildInputs = [ buildInputs = [
libopus libopus
openssl openssl
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/parrot \ wrapProgram $out/bin/parrot \

View file

@ -9,7 +9,6 @@
SDL2, SDL2,
libX11, libX11,
libXext, libXext,
Cocoa,
utf8proc, utf8proc,
nix-update-script, nix-update-script,
}: }:
@ -64,8 +63,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib alsa-lib
libXext libXext
] ];
++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -13,8 +13,6 @@
libvorbis, libvorbis,
libopus, libopus,
soxr, soxr,
IOKit,
AudioToolbox,
aixlog, aixlog,
popl, popl,
pulseaudioSupport ? false, pulseaudioSupport ? false,
@ -55,11 +53,7 @@ stdenv.mkDerivation rec {
openssl openssl
] ]
++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
++ lib.optionals stdenv.hostPlatform.isDarwin [
IOKit
AudioToolbox
];
TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS";

View file

@ -6,8 +6,6 @@
pkg-config, pkg-config,
alsa-lib, alsa-lib,
libxmp, libxmp,
AudioUnit,
CoreAudio,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,13 +23,7 @@ stdenv.mkDerivation rec {
autoreconfHook autoreconfHook
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [ libxmp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
[ libxmp ]
++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AudioUnit
CoreAudio
];
meta = with lib; { meta = with lib; {
description = "Extended module player"; description = "Extended module player";

View file

@ -7,9 +7,6 @@
makeWrapper, makeWrapper,
webkitgtk_4_0, webkitgtk_4_0,
zenity, zenity,
Cocoa,
Security,
WebKit,
withGui ? true, withGui ? true,
}: }:
@ -31,13 +28,7 @@ rustPlatform.buildRustPackage rec {
pkg-config pkg-config
makeWrapper makeWrapper
]; ];
buildInputs = buildInputs = lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0;
lib.optional stdenv.hostPlatform.isDarwin Security
++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0
++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [
Cocoa
WebKit
];
buildNoDefaultFeatures = true; buildNoDefaultFeatures = true;
buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui"; buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui";

View file

@ -1,10 +1,8 @@
{ {
lib, lib,
stdenv,
rustPlatform, rustPlatform,
fetchFromGitHub, fetchFromGitHub,
rocksdb_7_10, rocksdb_7_10,
Security,
}: }:
let let
@ -31,8 +29,6 @@ rustPlatform.buildRustPackage rec {
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
ROCKSDB_LIB_DIR = "${rocksdb}/lib"; ROCKSDB_LIB_DIR = "${rocksdb}/lib";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
passthru.updateScript = ./update.sh; passthru.updateScript = ./update.sh;
meta = with lib; { meta = with lib; {

View file

@ -1,6 +1,5 @@
{ {
cmake, cmake,
CoreFoundation,
fetchFromGitHub, fetchFromGitHub,
fetchurl, fetchurl,
lib, lib,
@ -11,10 +10,8 @@
protobuf, protobuf,
rustPlatform, rustPlatform,
rust-jemalloc-sys, rust-jemalloc-sys,
Security,
sqlite, sqlite,
stdenv, stdenv,
SystemConfiguration,
testers, testers,
}: }:
@ -59,11 +56,6 @@ rustPlatform.buildRustPackage rec {
] ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
openssl openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreFoundation
Security
SystemConfiguration
]; ];
depositContractSpec = fetchurl { depositContractSpec = fetchurl {

View file

@ -16,10 +16,6 @@
unbound, unbound,
zeromq, zeromq,
# darwin
CoreData,
IOKit,
trezorSupport ? true, trezorSupport ? true,
hidapi, hidapi,
libusb1, libusb1,
@ -88,10 +84,6 @@ stdenv.mkDerivation rec {
unbound unbound
zeromq zeromq
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
IOKit
CoreData
]
++ lib.optionals trezorSupport [ ++ lib.optionals trezorSupport [
python3 python3
hidapi hidapi

View file

@ -4,7 +4,6 @@
buildGoModule, buildGoModule,
fetchFromGitHub, fetchFromGitHub,
libobjc, libobjc,
IOKit,
}: }:
buildGoModule rec { buildGoModule rec {
@ -39,7 +38,6 @@ buildGoModule rec {
# Fix for usb-related segmentation faults on darwin # Fix for usb-related segmentation faults on darwin
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libobjc libobjc
IOKit
]; ];
ldflags = [ ldflags = [

View file

@ -10,8 +10,6 @@
rustPlatform, rustPlatform,
rustc, rustc,
stdenv, stdenv,
Security,
SystemConfiguration,
}: }:
let let
@ -60,13 +58,9 @@ rustPlatform.buildRustPackage rec {
]; ];
# NOTE: jemalloc is used by default on Linux with unprefixed enabled # NOTE: jemalloc is used by default on Linux with unprefixed enabled
buildInputs = buildInputs = [
[ openssl ] openssl
++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ];
++ lib.optionals stdenv.hostPlatform.isDarwin [
Security
SystemConfiguration
];
checkInputs = [ checkInputs = [
cacert cacert

View file

@ -3,7 +3,6 @@
fetchFromGitHub, fetchFromGitHub,
lib, lib,
rustPlatform, rustPlatform,
Security,
curl, curl,
pkg-config, pkg-config,
openssl, openssl,
@ -41,7 +40,6 @@ rustPlatform.buildRustPackage rec {
# ROCKSDB_LIB_DIR="${rocksdb}/lib"; # ROCKSDB_LIB_DIR="${rocksdb}/lib";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
Security
curl curl
]; ];

View file

@ -4,8 +4,6 @@
fetchFromGitHub, fetchFromGitHub,
protobuf, protobuf,
rustfmt, rustfmt,
stdenv,
darwin,
pkg-config, pkg-config,
openssl, openssl,
}: }:
@ -42,10 +40,6 @@ in
rustfmt rustfmt
]; ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
];
passthru.updateScript = updateScript; passthru.updateScript = updateScript;
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
@ -70,13 +64,9 @@ in
rustfmt rustfmt
]; ];
buildInputs = buildInputs = [
[ openssl
openssl ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
];
passthru.updateScript = updateScript; passthru.updateScript = updateScript;

View file

@ -15,7 +15,6 @@
makeWrapper, makeWrapper,
rustPlatform, rustPlatform,
pkg-config, pkg-config,
Security,
stdenv, stdenv,
testers, testers,
tl-expected, tl-expected,
@ -55,19 +54,15 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ boost
boost db62
db62 libevent
libevent libsodium
libsodium tl-expected
tl-expected utf8cpp
utf8cpp zeromq
zeromq ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Security
];
# Use the stdenv default phases (./configure; make) instead of the # Use the stdenv default phases (./configure; make) instead of the
# ones from buildRustPackage. # ones from buildRustPackage.

View file

@ -6,21 +6,6 @@ lib.makeScope pkgs.newScope (
inherit (self) callPackage; inherit (self) callPackage;
inheritedArgs = { inheritedArgs = {
inherit (pkgs.darwin) sigtool; inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk.frameworks)
Accelerate
AppKit
Carbon
Cocoa
GSS
ImageCaptureCore
ImageIO
IOKit
OSAKit
Quartz
QuartzCore
WebKit
;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers;
}; };
in in
{ {

View file

@ -810,12 +810,6 @@ let
osx-dictionary = osx-dictionary =
if pkgs.stdenv.hostPlatform.isDarwin then if pkgs.stdenv.hostPlatform.isDarwin then
super.osx-dictionary.overrideAttrs (old: { super.osx-dictionary.overrideAttrs (old: {
buildInputs =
old.buildInputs
++ (with pkgs.darwin.apple_sdk.frameworks; [
CoreServices
Foundation
]);
postBuild = postBuild =
(old.postBuild or "") (old.postBuild or "")
+ '' + ''

View file

@ -114,21 +114,6 @@
"lucid" "lucid"
), ),
# macOS dependencies for NS and macPort
Accelerate,
AppKit,
Carbon,
Cocoa,
GSS,
IOKit,
ImageCaptureCore,
ImageIO,
OSAKit,
Quartz,
QuartzCore,
UniformTypeIdentifiers,
WebKit,
# test # test
callPackage, callPackage,
}: }:
@ -372,27 +357,6 @@ mkDerivation (finalAttrs: {
] ]
++ lib.optionals withNS [ ++ lib.optionals withNS [
librsvg librsvg
AppKit
GSS
ImageIO
]
++ lib.optionals (variant == "macport") [
Accelerate
AppKit
Carbon
Cocoa
IOKit
OSAKit
Quartz
QuartzCore
WebKit
# TODO are these optional?
GSS
ImageCaptureCore
ImageIO
]
++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [
UniformTypeIdentifiers
]; ];
# Emacs needs to find movemail at run time, see info (emacs) Movemail # Emacs needs to find movemail at run time, see info (emacs) Movemail

View file

@ -22,9 +22,6 @@
SDL2, SDL2,
SDL2_image, SDL2_image,
lua, lua,
AppKit,
Cocoa,
Foundation,
nixosTests, nixosTests,
}: }:
@ -48,29 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
gtest gtest
]; ];
buildInputs = buildInputs = [
[ curl
curl freetype
freetype giflib
giflib libjpeg
libjpeg libpng
libpng libwebp
libwebp libarchive
libarchive libX11
libX11 pixman
pixman tinyxml-2
tinyxml-2 zlib
zlib SDL2
SDL2 SDL2_image
SDL2_image lua
lua # no v8 due to missing libplatform and libbase
# no v8 due to missing libplatform and libbase ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Cocoa
Foundation
];
cmakeFlags = [ cmakeFlags = [
"-DWITH_DESKTOP_INTEGRATION=ON" "-DWITH_DESKTOP_INTEGRATION=ON"

View file

@ -1,6 +1,5 @@
{ {
fetchFromGitHub, fetchFromGitHub,
Foundation,
freetype, freetype,
lib, lib,
lua5_4, lua5_4,
@ -29,16 +28,12 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ freetype
freetype lua5_4
lua5_4 pcre2
pcre2 SDL2
SDL2 ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Foundation
];
mesonFlags = [ mesonFlags = [
"-Duse_system_lua=true" "-Duse_system_lua=true"

View file

@ -14,9 +14,6 @@
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/68f6d131750aa778807119e03eed70286a17b1cb/trunk/archlinux.vim"; url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/68f6d131750aa778807119e03eed70286a17b1cb/trunk/archlinux.vim";
sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
}, },
# apple frameworks
Carbon,
Cocoa,
}: }:
let let
@ -41,16 +38,11 @@ stdenv.mkDerivation {
gettext gettext
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ ncurses
ncurses bash
bash gawk
gawk ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
];
strictDeps = true; strictDeps = true;

View file

@ -30,11 +30,6 @@
makeWrapper, makeWrapper,
wrapGAppsHook3, wrapGAppsHook3,
# apple frameworks
CoreServices,
CoreData,
Cocoa,
Foundation,
libobjc, libobjc,
features ? "huge", # One of tiny, small, normal, big or huge features ? "huge", # One of tiny, small, normal, big or huge
@ -196,10 +191,6 @@ stdenv.mkDerivation {
++ lib.optional (guiSupport == "gtk2") gtk2-x11 ++ lib.optional (guiSupport == "gtk2") gtk2-x11
++ lib.optional (guiSupport == "gtk3") gtk3-x11 ++ lib.optional (guiSupport == "gtk3") gtk3-x11
++ lib.optionals darwinSupport [ ++ lib.optionals darwinSupport [
CoreServices
CoreData
Cocoa
Foundation
libobjc libobjc
] ]
++ lib.optional luaSupport lua ++ lib.optional luaSupport lua

View file

@ -10,8 +10,6 @@
esbuild, esbuild,
pkg-config, pkg-config,
libsecret, libsecret,
stdenv,
darwin,
setDefaultServerPath ? true, setDefaultServerPath ? true,
}: }:
@ -39,18 +37,13 @@ let
buildInputs = [ buildInputs = [
pkgsBuildBuild.libsecret pkgsBuildBuild.libsecret
]; ];
nativeBuildInputs = nativeBuildInputs = [
[ jq
jq moreutils
moreutils esbuild
esbuild # Required by `keytar`, which is a dependency of `vsce`.
# Required by `keytar`, which is a dependency of `vsce`. pkg-config
pkg-config ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Security
];
# Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65
installPhase = '' installPhase = ''

View file

@ -4,8 +4,6 @@
fetchFromGitHub, fetchFromGitHub,
pkg-config, pkg-config,
openssl, openssl,
stdenv,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -26,7 +24,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; buildInputs = [ openssl ];
# disable downloading and building the tree-sitter grammars at build time # disable downloading and building the tree-sitter grammars at build time
# grammars can be configured in a config file and installed with `zee --build` # grammars can be configured in a config file and installed with `zee --build`

View file

@ -3,10 +3,7 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
alsa-lib, alsa-lib,
AudioUnit,
autoreconfHook, autoreconfHook,
Carbon,
Cocoa,
ffmpeg, ffmpeg,
fluidsynth, fluidsynth,
freetype, freetype,
@ -86,11 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
alsa-lib alsa-lib
libxkbfile libxkbfile
libXrandr libXrandr
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AudioUnit
Carbon
Cocoa
]; ];
# Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory

View file

@ -11,7 +11,6 @@
graphicsmagick, graphicsmagick,
libGL, libGL,
libGLU, libGLU,
OpenGL,
libpng, libpng,
makeDesktopItem, makeDesktopItem,
}: }:
@ -46,17 +45,10 @@ stdenv.mkDerivation rec {
SDL_sound SDL_sound
libpng libpng
] ]
++ ( ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
if stdenv.hostPlatform.isDarwin then libGL
[ libGLU
OpenGL ];
]
else
[
libGL
libGLU
]
);
# Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL subdirectory # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL subdirectory
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_net}/include/SDL"; env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_net}/include/SDL";

View file

@ -32,12 +32,8 @@
which, which,
writeScript, writeScript,
zlib, zlib,
darwin,
}: }:
let
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mame"; pname = "mame";
version = "0.276"; version = "0.276";
@ -105,8 +101,6 @@ stdenv.mkDerivation rec {
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libpcap libpcap
CoreAudioKit
ForceFeedback
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,6 +1,5 @@
{ {
lib, lib,
stdenv,
cmake, cmake,
rustPlatform, rustPlatform,
pkg-config, pkg-config,
@ -9,7 +8,6 @@
gtk3, gtk3,
glib, glib,
openssl, openssl,
Security,
nix-update-script, nix-update-script,
}: }:
@ -32,7 +30,7 @@ rustPlatform.buildRustPackage rec {
glib glib
gtk3 gtk3
openssl openssl
] ++ lib.optional stdenv.hostPlatform.isDarwin Security; ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake

View file

@ -45,8 +45,6 @@
libde265Support ? true, libde265Support ? true,
libde265, libde265,
fftw, fftw,
ApplicationServices,
Foundation,
testers, testers,
}: }:
@ -124,11 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional djvulibreSupport djvulibre ++ lib.optional djvulibreSupport djvulibre
++ lib.optional openexrSupport openexr ++ lib.optional openexrSupport openexr
++ lib.optional librsvgSupport librsvg ++ lib.optional librsvgSupport librsvg
++ lib.optional openjpegSupport openjpeg ++ lib.optional openjpegSupport openjpeg;
++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Foundation
];
propagatedBuildInputs = propagatedBuildInputs =
[ fftw ] [ fftw ]

View file

@ -52,8 +52,6 @@
potrace, potrace,
coreutils, coreutils,
curl, curl,
ApplicationServices,
Foundation,
testers, testers,
nixos-icons, nixos-icons,
perlPackages, perlPackages,
@ -147,11 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
librsvg librsvg
pango pango
] ]
++ lib.optional openjpegSupport openjpeg ++ lib.optional openjpegSupport openjpeg;
++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Foundation
];
propagatedBuildInputs = propagatedBuildInputs =
[ curl ] [ curl ]

View file

@ -4,7 +4,6 @@
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
itk, itk,
Cocoa,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -19,7 +18,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ itk ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; buildInputs = [ itk ];
cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ];

View file

@ -12,7 +12,6 @@
qttools, qttools,
xorg, xorg,
libtiff, libtiff,
darwin,
}: }:
mkDerivation rec { mkDerivation rec {
@ -42,7 +41,7 @@ mkDerivation rec {
qtbase qtbase
xorg.libXt xorg.libXt
libtiff libtiff
] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AGL; ];
preConfigure = '' preConfigure = ''
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh

View file

@ -16,11 +16,6 @@
libxcb, libxcb,
libxkbcommon, libxkbcommon,
wayland, wayland,
AppKit,
CoreGraphics,
CoreServices,
Foundation,
OpenGL,
}: }:
let let
rpathLibs = rpathLibs =
@ -59,15 +54,7 @@ rustPlatform.buildRustPackage rec {
python3 python3
]; ];
buildInputs = buildInputs = rpathLibs;
rpathLibs
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
CoreGraphics
CoreServices
Foundation
OpenGL
];
postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion

View file

@ -9,7 +9,6 @@
freetype, freetype,
libGL, libGL,
xorg, xorg,
AppKit,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -31,19 +30,15 @@ rustPlatform.buildRustPackage rec {
pkg-config pkg-config
]; ];
buildInputs = buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
lib.optionals stdenv.hostPlatform.isLinux [ expat
expat fontconfig
fontconfig freetype
freetype xorg.libX11
xorg.libX11 xorg.libXcursor
xorg.libXcursor xorg.libXi
xorg.libXi xorg.libXrandr
xorg.libXrandr ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
];
postInstall = '' postInstall = ''
install -Dm444 assets/epick.desktop -t $out/share/applications install -Dm444 assets/epick.desktop -t $out/share/applications

View file

@ -11,8 +11,6 @@
# See https://github.com/NixOS/nixpkgs/pull/324022. This may change later. # See https://github.com/NixOS/nixpkgs/pull/324022. This may change later.
vtk_9, vtk_9,
autoPatchelfHook, autoPatchelfHook,
Cocoa,
OpenGL,
python3Packages, python3Packages,
opencascade-occt, opencascade-occt,
assimp, assimp,
@ -64,10 +62,6 @@ stdenv.mkDerivation rec {
assimp assimp
fontconfig fontconfig
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
OpenGL
]
++ lib.optionals withPythonBinding [ ++ lib.optionals withPythonBinding [
python3Packages.python python3Packages.python
# Using C++ header files, not Python import # Using C++ header files, not Python import

View file

@ -17,12 +17,6 @@
libGLU, libGLU,
alsa-lib, alsa-lib,
fontconfig, fontconfig,
AVFoundation,
Carbon,
Cocoa,
CoreAudio,
Kernel,
OpenGL,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -75,14 +69,6 @@ stdenv.mkDerivation rec {
alsa-lib alsa-lib
fontconfig fontconfig
libGLU libGLU
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AVFoundation
Carbon
Cocoa
CoreAudio
Kernel
OpenGL
]; ];
env.NIX_CFLAGS_COMPILE = toString [ env.NIX_CFLAGS_COMPILE = toString [

View file

@ -47,8 +47,6 @@
libgudev, libgudev,
openexr, openexr,
desktopToDarwinBundle, desktopToDarwinBundle,
AppKit,
Cocoa,
gtk-mac-integration-gtk2, gtk-mac-integration-gtk2,
withPython ? false, withPython ? false,
python2, python2,
@ -144,8 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
mypaint-brushes1 mypaint-brushes1
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Cocoa
gtk-mac-integration-gtk2 gtk-mac-integration-gtk2
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [

View file

@ -66,8 +66,6 @@
adwaita-icon-theme, adwaita-icon-theme,
alsa-lib, alsa-lib,
desktopToDarwinBundle, desktopToDarwinBundle,
AppKit,
Cocoa,
}: }:
let let
@ -202,8 +200,6 @@ stdenv.mkDerivation (finalAttrs: {
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
llvmPackages.openmp llvmPackages.openmp
AppKit
Cocoa
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
libgudev libgudev

View file

@ -17,7 +17,6 @@
gtk4, gtk4,
gdk-pixbuf, gdk-pixbuf,
libadwaita, libadwaita,
Foundation,
nix-update-script, nix-update-script,
}: }:
@ -60,16 +59,12 @@ stdenv.mkDerivation (finalAttrs: {
desktop-file-utils desktop-file-utils
]; ];
buildInputs = buildInputs = [
[ glib
glib gtk4
gtk4 gdk-pixbuf
gdk-pixbuf libadwaita
libadwaita ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Foundation
];
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };

View file

@ -8,7 +8,6 @@
withSixel ? false, withSixel ? false,
libsixel, libsixel,
xorg, xorg,
AppKit,
withSki ? true, withSki ? true,
}: }:
@ -36,8 +35,7 @@ rustPlatform.buildRustPackage rec {
libX11 libX11
libXrandr libXrandr
] ]
) );
++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
buildNoDefaultFeatures = !withSki; buildNoDefaultFeatures = !withSki;
buildFeatures = lib.optional withSixel "sixel"; buildFeatures = lib.optional withSixel "sixel";

View file

@ -18,7 +18,6 @@
qtbase, qtbase,
qtsvg, qtsvg,
qttools, qttools,
VideoDecodeAcceleration,
wrapQtAppsHook, wrapQtAppsHook,
copyDesktopItems, copyDesktopItems,
# needed to run natively on wayland # needed to run natively on wayland
@ -44,26 +43,22 @@ stdenv.mkDerivation rec {
copyDesktopItems copyDesktopItems
]; ];
buildInputs = buildInputs = [
[ boost
boost bzip2
bzip2 ffmpeg
ffmpeg fftwSinglePrec
fftwSinglePrec hdf5
hdf5 muparser
muparser netcdf
netcdf openssl
openssl python3
python3 qscintilla
qscintilla qtbase
qtbase qtsvg
qtsvg qttools
qttools qtwayland
qtwayland ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
VideoDecodeAcceleration
];
# manually create a desktop file # manually create a desktop file
desktopItems = [ desktopItems = [

View file

@ -1,17 +1,12 @@
{ {
callPackage, callPackage,
lowPrio, lowPrio,
Accelerate,
CoreGraphics,
CoreVideo,
}: }:
let let
base3 = callPackage ./tesseract3.nix { }; base3 = callPackage ./tesseract3.nix { };
base4 = callPackage ./tesseract4.nix { }; base4 = callPackage ./tesseract4.nix { };
base5 = callPackage ./tesseract5.nix { base5 = callPackage ./tesseract5.nix { };
inherit Accelerate CoreGraphics CoreVideo;
};
languages = callPackage ./languages.nix { }; languages = callPackage ./languages.nix { };
in in
{ {

View file

@ -12,9 +12,6 @@
libtiff, libtiff,
icu, icu,
pango, pango,
Accelerate,
CoreGraphics,
CoreVideo,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,21 +32,15 @@ stdenv.mkDerivation rec {
autoreconfHook autoreconfHook
]; ];
buildInputs = buildInputs = [
[ curl
curl leptonica
leptonica libarchive
libarchive libpng
libpng libtiff
libtiff icu
icu pango
pango ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Accelerate
CoreGraphics
CoreVideo
];
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };
meta = { meta = {

View file

@ -27,9 +27,7 @@
SDL2, SDL2,
SDL2_mixer, SDL2_mixer,
wayland-protocols, wayland-protocols,
Carbon,
CoreServices, CoreServices,
OpenCL,
callPackage, callPackage,
nixosTests, nixosTests,
@ -73,11 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
SDL2_mixer SDL2_mixer
] ]
++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols
++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
CoreServices
OpenCL
]
++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers; ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers;
cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}";

View file

@ -19,10 +19,6 @@
autoconf, autoconf,
libtool, libtool,
typescript, typescript,
ApplicationServices,
Carbon,
Cocoa,
VideoToolbox,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -41,12 +37,6 @@ rustPlatform.buildRustPackage rec {
ffmpeg ffmpeg
x264 x264
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Carbon
Cocoa
VideoToolbox
]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
dbus dbus
libva libva

View file

@ -6,7 +6,6 @@
autoreconfHook, autoreconfHook,
autoconf-archive, autoconf-archive,
pkg-config, pkg-config,
CoreAudio,
enableAlsa ? true, enableAlsa ? true,
alsa-lib, alsa-lib,
enableLibao ? true, enableLibao ? true,
@ -84,8 +83,7 @@ stdenv.mkDerivation {
amrnb amrnb
amrwb amrwb
] ]
++ lib.optional enableLibpulseaudio libpulseaudio ++ lib.optional enableLibpulseaudio libpulseaudio;
++ lib.optional stdenv.hostPlatform.isDarwin CoreAudio;
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -4,13 +4,6 @@
rustPlatform, rustPlatform,
fetchFromGitHub, fetchFromGitHub,
makeWrapper, makeWrapper,
AppKit,
CoreFoundation,
CoreGraphics,
CoreVideo,
Foundation,
Metal,
QuartzCore,
xorg, xorg,
vulkan-loader, vulkan-loader,
}: }:
@ -33,16 +26,6 @@ rustPlatform.buildRustPackage rec {
makeWrapper makeWrapper
]; ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
CoreFoundation
CoreGraphics
CoreVideo
Foundation
Metal
QuartzCore
];
postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
wrapProgram $out/bin/binocle \ wrapProgram $out/bin/binocle \
--suffix LD_LIBRARY_PATH : ${ --suffix LD_LIBRARY_PATH : ${

View file

@ -8,7 +8,6 @@
cairo, cairo,
poppler, poppler,
wxGTK, wxGTK,
Cocoa,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
cairo cairo
poppler poppler
wxGTK wxGTK
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; ];
preConfigure = "./bootstrap"; preConfigure = "./bootstrap";

View file

@ -5,8 +5,6 @@
pkg-config, pkg-config,
libgit2, libgit2,
openssl, openssl,
stdenv,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -25,14 +23,10 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = buildInputs = [
[ libgit2
libgit2 openssl
openssl ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Security
];
useNextest = true; useNextest = true;

View file

@ -17,12 +17,6 @@
gnutar, gnutar,
p7zip, p7zip,
xz, xz,
IOKit,
Carbon,
Cocoa,
AudioToolbox,
OpenGL,
System,
withTTYX ? true, withTTYX ? true,
libX11, libX11,
withGUI ? true, withGUI ? true,
@ -94,15 +88,7 @@ stdenv.mkDerivation rec {
debugpy debugpy
pcpp pcpp
] ]
) );
++ lib.optionals stdenv.hostPlatform.isDarwin [
IOKit
Carbon
Cocoa
AudioToolbox
OpenGL
System
];
postPatch = '' postPatch = ''
patchShebangs python/src/prebuild.sh patchShebangs python/src/prebuild.sh

View file

@ -10,7 +10,6 @@
libSM, libSM,
libICE, libICE,
which, which,
IOKit,
copyDesktopItems, copyDesktopItems,
makeDesktopItem, makeDesktopItem,
wrapGAppsHook3, wrapGAppsHook3,
@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
libX11 libX11
libSM libSM
libICE libICE
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

View file

@ -4,9 +4,6 @@
rustPlatform, rustPlatform,
pkg-config, pkg-config,
openssl, openssl,
stdenv,
CoreServices,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -25,14 +22,9 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = buildInputs = [
[ openssl
openssl ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
Security
];
meta = with lib; { meta = with lib; {
description = "Knowledge management meta-framework for geeks"; description = "Knowledge management meta-framework for geeks";

View file

@ -11,7 +11,6 @@
wayland, wayland,
libGL, libGL,
openssl, openssl,
darwin,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -36,20 +35,16 @@ rustPlatform.buildRustPackage rec {
pkg-config pkg-config
]; ];
buildInputs = buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
lib.optionals stdenv.hostPlatform.isLinux [ fontconfig
fontconfig xorg.libXcursor
xorg.libXcursor xorg.libXi
xorg.libXi xorg.libXrandr
xorg.libXrandr xorg.libxcb
xorg.libxcb wayland
wayland libxkbcommon
libxkbcommon openssl
openssl ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk_11_0.frameworks.AppKit
];
checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
# time out on darwin # time out on darwin

View file

@ -6,8 +6,6 @@
pkg-config, pkg-config,
openssl, openssl,
libgit2, libgit2,
Security,
SystemConfiguration,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -30,8 +28,6 @@ rustPlatform.buildRustPackage rec {
[ openssl ] [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libgit2 libgit2
Security
SystemConfiguration
]; ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -3,7 +3,6 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
CoreServices,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac="; cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
meta = with lib; { meta = with lib; {
description = "Plain text Zettelkasten based on mdBook"; description = "Plain text Zettelkasten based on mdBook";
homepage = "https://github.com/mdzk-rs/mdzk/"; homepage = "https://github.com/mdzk-rs/mdzk/";

View file

@ -1,7 +1,6 @@
{ {
stdenv, stdenv,
lib, lib,
AppKit,
DarwinTools, DarwinTools,
alsa-utils, alsa-utils,
at-spi2-core, at-spi2-core,
@ -86,9 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
flac flac
gitMinimal gitMinimal
] ]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
AppKit
]
++ [ ++ [
glew glew
jasper jasper

View file

@ -1,9 +1,7 @@
{ {
lib, lib,
stdenv,
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug="; cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
meta = with lib; { meta = with lib; {
description = "Command-line tool to generate, analyze, convert and manipulate colors"; description = "Command-line tool to generate, analyze, convert and manipulate colors";
homepage = "https://github.com/sharkdp/pastel"; homepage = "https://github.com/sharkdp/pastel";

View file

@ -3,7 +3,6 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
Foundation,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
@ -19,7 +18,6 @@ rustPlatform.buildRustPackage {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k="; cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ];
meta = with lib; { meta = with lib; {
description = "Simple CLI pomodoro timer using desktop notifications written in Rust"; description = "Simple CLI pomodoro timer using desktop notifications written in Rust";

View file

@ -11,7 +11,6 @@
cereal, cereal,
cgal, cgal,
curl, curl,
darwin,
dbus, dbus,
eigen, eigen,
expat, expat,
@ -142,9 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
] ]
++ lib.optionals withSystemd [ ++ lib.optionals withSystemd [
systemd systemd
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk_11_0.frameworks.CoreWLAN
]; ];
strictDeps = true; strictDeps = true;

View file

@ -2,8 +2,6 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
Libsystem,
SystemConfiguration,
installShellFiles, installShellFiles,
libiconv, libiconv,
rustPlatform, rustPlatform,
@ -32,8 +30,6 @@ rustPlatform.buildRustPackage rec {
]; ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
Libsystem
SystemConfiguration
libiconv libiconv
]; ];

View file

@ -1,11 +1,9 @@
{ {
lib, lib,
stdenv,
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
openssl, openssl,
pkg-config, pkg-config,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -23,7 +21,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg="; cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; buildInputs = [ openssl ];
# package does not contain tests as of v0.3.3 # package does not contain tests as of v0.3.3
docCheck = false; docCheck = false;

View file

@ -19,7 +19,6 @@
pyxdg, pyxdg,
withQuartz ? stdenv.hostPlatform.isDarwin, withQuartz ? stdenv.hostPlatform.isDarwin,
ApplicationServices,
withRandr ? stdenv.hostPlatform.isLinux, withRandr ? stdenv.hostPlatform.isLinux,
libxcb, libxcb,
withDrm ? stdenv.hostPlatform.isLinux, withDrm ? stdenv.hostPlatform.isLinux,
@ -29,9 +28,6 @@
withGeolocation ? true, withGeolocation ? true,
withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin, withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin,
CoreLocation,
Foundation,
Cocoa,
withGeoclue ? withGeolocation && stdenv.hostPlatform.isLinux, withGeoclue ? withGeolocation && stdenv.hostPlatform.isLinux,
geoclue, geoclue,
withAppIndicator ? stdenv.hostPlatform.isLinux, withAppIndicator ? stdenv.hostPlatform.isLinux,
@ -99,12 +95,6 @@ let
++ lib.optional withGeoclue geoclue ++ lib.optional withGeoclue geoclue
++ lib.optional withDrm libdrm ++ lib.optional withDrm libdrm
++ lib.optional withVidmode libXxf86vm ++ lib.optional withVidmode libXxf86vm
++ lib.optional withQuartz ApplicationServices
++ lib.optionals withCoreLocation [
CoreLocation
Foundation
Cocoa
]
++ lib.optional withAppIndicator ( ++ lib.optional withAppIndicator (
if (pname != "gammastep") then libappindicator else libayatana-appindicator if (pname != "gammastep") then libappindicator else libayatana-appindicator
); );

View file

@ -4,8 +4,6 @@
fetchFromGitHub, fetchFromGitHub,
openssl, openssl,
pkg-config, pkg-config,
stdenv,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; buildInputs = [ openssl ];
meta = with lib; { meta = with lib; {
description = "Impossibly fast web search, made for static sites"; description = "Impossibly fast web search, made for static sites";

View file

@ -2,8 +2,6 @@
lib, lib,
stdenv, stdenv,
fetchurl, fetchurl,
Carbon,
Cocoa,
ffmpeg, ffmpeg,
glib, glib,
libGLU, libGLU,
@ -43,10 +41,6 @@ stdenv.mkDerivation rec {
gdal gdal
wxGTK32 wxGTK32
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
# TODO: libGLU doesn't build for macOS because of Mesa issues # TODO: libGLU doesn't build for macOS because of Mesa issues
# (#233265); is it required for anything? # (#233265); is it required for anything?

View file

@ -27,13 +27,6 @@
xinput, xinput,
avahi-compat, avahi-compat,
# MacOS / darwin
ApplicationServices,
Carbon,
Cocoa,
CoreServices,
ScreenSaver,
UserNotifications,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -74,14 +67,6 @@ stdenv.mkDerivation rec {
openssl openssl
pcre pcre
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Carbon
Cocoa
CoreServices
ScreenSaver
UserNotifications
]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
util-linux util-linux
libselinux libselinux

View file

@ -8,7 +8,6 @@
openssl, openssl,
sqlite, sqlite,
libiconv, libiconv,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -35,7 +34,6 @@ rustPlatform.buildRustPackage rec {
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv libiconv
Security
]; ];
OPENSSL_NO_VENDOR = 1; OPENSSL_NO_VENDOR = 1;

View file

@ -4,7 +4,6 @@
fetchurl, fetchurl,
tcl, tcl,
tk, tk,
Cocoa,
makeWrapper, makeWrapper,
}: }:
@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
tcl tcl
tk tk
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

View file

@ -1,12 +1,10 @@
{ {
lib, lib,
stdenv,
rustPlatform, rustPlatform,
fetchFromSourcehut, fetchFromSourcehut,
pkg-config, pkg-config,
ncurses, ncurses,
openssl, openssl,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -28,7 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ buildInputs = [
ncurses ncurses
openssl openssl
] ++ lib.optional stdenv.hostPlatform.isDarwin Security; ];
meta = with lib; { meta = with lib; {
description = "Gemini Project client written in Rust with NCurses"; description = "Gemini Project client written in Rust with NCurses";

View file

@ -14,7 +14,6 @@
opusfile, opusfile,
SDL2, SDL2,
the-foundation, the-foundation,
AppKit,
zip, zip,
enableTUI ? false, enableTUI ? false,
ncurses, ncurses,
@ -53,8 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals enableTUI [ ++ lib.optionals enableTUI [
ncurses ncurses
sealcurses sealcurses
] ];
++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "ENABLE_TUI" enableTUI) (lib.cmakeBool "ENABLE_TUI" enableTUI)

View file

@ -3,7 +3,6 @@
stdenv, stdenv,
rustPlatform, rustPlatform,
fetchFromGitHub, fetchFromGitHub,
Security ? null,
versionCheckHook, versionCheckHook,
}: }:
@ -21,8 +20,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-6sRpsXydzKB0ZaV1HeagINgb6ol9dj3XT0+pd53QOCw="; cargoHash = "sha256-6sRpsXydzKB0ZaV1HeagINgb6ol9dj3XT0+pd53QOCw=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
doInstallCheck = true; doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ]; nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version"; versionCheckProgramArg = "--version";

View file

@ -7,7 +7,6 @@
pkg-config, pkg-config,
which, which,
libvirt, libvirt,
vmnet,
withQemu ? false, withQemu ? false,
qemu, qemu,
makeWrapper, makeWrapper,
@ -49,13 +48,7 @@ buildGoModule rec {
makeWrapper makeWrapper
]; ];
buildInputs = buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libvirt ];
if stdenv.hostPlatform.isDarwin then
[ vmnet ]
else if stdenv.hostPlatform.isLinux then
[ libvirt ]
else
null;
buildPhase = '' buildPhase = ''
make COMMIT=${src.rev} make COMMIT=${src.rev}

View file

@ -1,9 +1,7 @@
{ {
lib, lib,
stdenv,
fetchCrate, fetchCrate,
rustPlatform, rustPlatform,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-A7kD46gfXWK/OlFVMULlMa7Z9Q1it9/rhGo6pjFa38k="; cargoHash = "sha256-A7kD46gfXWK/OlFVMULlMa7Z9Q1it9/rhGo6pjFa38k=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {

View file

@ -18,8 +18,6 @@
wxGTK32, wxGTK32,
gtk3, gtk3,
xdg-utils, xdg-utils,
CoreServices,
Security,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -43,26 +41,21 @@ stdenv.mkDerivation {
wrapGAppsHook3 wrapGAppsHook3
]; ];
buildInputs = buildInputs = [
[ boost
boost dbus
dbus gettext
gettext gnutls
gnutls libfilezilla
libfilezilla libidn
libidn nettle
nettle pugixml
pugixml sqlite
sqlite tinyxml
tinyxml wxGTK32
wxGTK32 gtk3
gtk3 xdg-utils
xdg-utils ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
Security
];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,13 +1,11 @@
{ {
lib, lib,
stdenv,
fetchFromGitHub, fetchFromGitHub,
installShellFiles, installShellFiles,
rustPlatform, rustPlatform,
pkg-config, pkg-config,
openssl, openssl,
scdoc, scdoc,
Security,
which, which,
}: }:
@ -36,7 +34,7 @@ rustPlatform.buildRustPackage rec {
scdoc scdoc
which which
]; ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; buildInputs = [ openssl ];
postInstall = '' postInstall = ''
make manual make manual

View file

@ -1,13 +1,9 @@
{ {
lib, lib,
stdenv,
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
pkg-config, pkg-config,
openssl, openssl,
CoreServices,
Security,
SystemConfiguration,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -28,15 +24,9 @@ rustPlatform.buildRustPackage rec {
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ openssl
openssl ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
Security
SystemConfiguration
];
meta = with lib; { meta = with lib; {
description = "Twitch chat in the terminal"; description = "Twitch chat in the terminal";

View file

@ -4,7 +4,6 @@
rustPlatform, rustPlatform,
fetchFromGitHub, fetchFromGitHub,
pkg-config, pkg-config,
Foundation,
dbusSupport ? stdenv.hostPlatform.isLinux, dbusSupport ? stdenv.hostPlatform.isLinux,
dbus, dbus,
# rustls will be used for TLS if useOpenSSL=false # rustls will be used for TLS if useOpenSSL=false
@ -28,10 +27,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM="; cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM=";
nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config;
buildInputs = buildInputs = lib.optionals dbusSupport [ dbus ] ++ lib.optionals useOpenSSL [ openssl ];
lib.optionals dbusSupport [ dbus ]
++ lib.optionals useOpenSSL [ openssl ]
++ lib.optional stdenv.hostPlatform.isDarwin Foundation;
buildFeatures = lib.optional notificationSupport "desktop-notifications"; buildFeatures = lib.optional notificationSupport "desktop-notifications";

View file

@ -9,7 +9,6 @@
gpgSupport ? true, gpgSupport ? true,
sslSupport ? true, sslSupport ? true,
fetchpatch, fetchpatch,
Foundation,
}: }:
assert gpgSupport -> gpgme != null; assert gpgSupport -> gpgme != null;
@ -42,10 +41,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = buildInputs =
[ gtk2 ] [ gtk2 ] ++ lib.optionals gpgSupport [ gpgme ] ++ lib.optionals sslSupport [ openssl ];
++ lib.optionals gpgSupport [ gpgme ]
++ lib.optionals sslSupport [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ];
configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl"; configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl";

View file

@ -1,10 +1,7 @@
{ {
lib, lib,
stdenv,
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
Security,
SystemConfiguration,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -21,11 +18,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE="; cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
Security
SystemConfiguration
];
CARGO_CRATE_NAME = "mhost"; CARGO_CRATE_NAME = "mhost";
doCheck = false; doCheck = false;

View file

@ -7,7 +7,6 @@
gsasl, gsasl,
libidn, libidn,
pkg-config, pkg-config,
Security,
nlsSupport ? true, nlsSupport ? true,
idnSupport ? true, idnSupport ? true,
gsaslSupport ? true, gsaslSupport ? true,
@ -33,8 +32,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = buildInputs =
lib.optional stdenv.hostPlatform.isDarwin Security lib.optional gsaslSupport gsasl
++ lib.optional gsaslSupport gsasl
++ lib.optional idnSupport libidn ++ lib.optional idnSupport libidn
++ lib.optional (sslLibrary == "gnutls") gnutls ++ lib.optional (sslLibrary == "gnutls") gnutls
++ lib.optional (sslLibrary == "openssl") openssl; ++ lib.optional (sslLibrary == "openssl") openssl;

View file

@ -15,7 +15,6 @@
netcat-gnu, netcat-gnu,
texinfo, texinfo,
which, which,
Security,
withKeyring ? true, withKeyring ? true,
libsecret, libsecret,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
@ -56,14 +55,11 @@ let
"--with-libgsasl" "--with-libgsasl"
] ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ]; ] ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ];
buildInputs = buildInputs = [
[ gnutls
gnutls gsasl
gsasl libidn2
libidn2 ] ++ optionals withKeyring [ libsecret ];
]
++ optionals stdenv.hostPlatform.isDarwin [ Security ]
++ optionals withKeyring [ libsecret ];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook

View file

@ -3,8 +3,6 @@
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
notmuch, notmuch,
stdenv,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -23,7 +21,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ buildInputs = [
notmuch notmuch
] ++ lib.optional stdenv.hostPlatform.isDarwin Security; ];
meta = with lib; { meta = with lib; {
description = "JMAP integration for notmuch mail"; description = "JMAP integration for notmuch mail";

View file

@ -1,12 +1,9 @@
{ {
lib, lib,
stdenv,
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
pkg-config, pkg-config,
openssl, openssl,
CoreServices,
Security,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
@ -24,12 +21,7 @@ rustPlatform.buildRustPackage {
cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4="; cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = buildInputs = [ openssl ];
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
Security
];
cargoBuildFlags = [ "--all" ]; cargoBuildFlags = [ "--all" ];

View file

@ -23,7 +23,6 @@
dht, dht,
libnatpmp, libnatpmp,
libiconv, libiconv,
Foundation,
# Build options # Build options
enableGTK3 ? false, enableGTK3 ? false,
gtkmm3, gtkmm3,

View file

@ -7,9 +7,6 @@
libsamplerate, libsamplerate,
swig, swig,
alsa-lib, alsa-lib,
AppKit,
CoreFoundation,
Security,
python3, python3,
pythonSupport ? true, pythonSupport ? true,
runCommand, runCommand,
@ -45,17 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
python3.pkgs.wheel python3.pkgs.wheel
]; ];
buildInputs = buildInputs = [
[ openssl
openssl libsamplerate
libsamplerate ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
]
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
CoreFoundation
Security
];
env = env =
lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }

View file

@ -7,7 +7,6 @@
pkg-config, pkg-config,
gtk3, gtk3,
ncurses, ncurses,
darwin,
copyDesktopItems, copyDesktopItems,
makeDesktopItem, makeDesktopItem,
}: }:
@ -30,12 +29,10 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
copyDesktopItems copyDesktopItems
]; ];
buildInputs = buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
lib.optionals stdenv.hostPlatform.isUnix [ gtk3
gtk3 ncurses
ncurses ];
]
++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp;
enableParallelBuilding = true; enableParallelBuilding = true;
desktopItems = [ desktopItems = [

Some files were not shown because too many files have changed in this diff Show more