From dd0f03a56cf2be99f0904ff1f64e1cc5fb201d43 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 14 Apr 2025 09:29:14 -0400 Subject: [PATCH] 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 --- doc/languages-frameworks/beam.section.md | 9 +- pkgs/applications/audio/cd-discid/default.nix | 3 - pkgs/applications/audio/chuck/default.nix | 20 +- pkgs/applications/audio/cmus/default.nix | 6 - pkgs/applications/audio/csound/default.nix | 8 - pkgs/applications/audio/espeak-ng/default.nix | 10 +- pkgs/applications/audio/ft2-clone/default.nix | 8 - .../applications/audio/grandorgue/default.nix | 2 - .../audio/listenbrainz-mpd/default.nix | 6 - .../audio/littlegptracker/default.nix | 2 - pkgs/applications/audio/master_me/default.nix | 2 - .../audio/midivisualizer/default.nix | 16 - pkgs/applications/audio/minidsp/default.nix | 9 +- pkgs/applications/audio/mmlgui/default.nix | 6 - pkgs/applications/audio/moc/default.nix | 2 - pkgs/applications/audio/mpg123/default.nix | 4 - pkgs/applications/audio/muso/default.nix | 2 - pkgs/applications/audio/parrot/default.nix | 4 +- .../audio/schismtracker/default.nix | 4 +- pkgs/applications/audio/snapcast/default.nix | 8 +- pkgs/applications/audio/xmp/default.nix | 10 +- .../blockchains/alfis/default.nix | 11 +- .../blockchains/electrs/default.nix | 4 - .../blockchains/lighthouse/default.nix | 8 - .../blockchains/monero-cli/default.nix | 8 - .../blockchains/optimism/geth.nix | 2 - .../blockchains/polkadot/default.nix | 12 +- .../blockchains/snarkos/default.nix | 2 - .../applications/blockchains/teos/default.nix | 16 +- .../blockchains/zcash/default.nix | 23 +- pkgs/applications/editors/emacs/default.nix | 15 - .../emacs/elisp-packages/melpa-packages.nix | 6 - .../applications/editors/emacs/make-emacs.nix | 36 - .../editors/libresprite/default.nix | 43 +- pkgs/applications/editors/lite-xl/default.nix | 17 +- pkgs/applications/editors/vim/default.nix | 18 +- pkgs/applications/editors/vim/full.nix | 9 - .../rust-lang.rust-analyzer/default.nix | 21 +- pkgs/applications/editors/zee/default.nix | 4 +- .../emulators/dosbox-x/default.nix | 8 - .../applications/emulators/dosbox/default.nix | 16 +- pkgs/applications/emulators/mame/default.nix | 6 - .../gis/whitebox-tools/default.nix | 4 +- .../applications/graphics/ImageMagick/6.x.nix | 8 +- .../graphics/ImageMagick/default.nix | 8 +- pkgs/applications/graphics/c3d/default.nix | 3 +- pkgs/applications/graphics/djview/default.nix | 3 +- .../graphics/emulsion/default.nix | 15 +- pkgs/applications/graphics/epick/default.nix | 23 +- pkgs/applications/graphics/f3d/default.nix | 6 - .../graphics/foxotron/default.nix | 14 - .../graphics/gimp/2.0/default.nix | 4 - pkgs/applications/graphics/gimp/default.nix | 4 - .../graphics/gnome-obfuscate/default.nix | 17 +- .../applications/graphics/menyoki/default.nix | 4 +- pkgs/applications/graphics/ovito/default.nix | 37 +- .../graphics/tesseract/default.nix | 7 +- .../graphics/tesseract/tesseract5.nix | 27 +- .../graphics/vengi-tools/default.nix | 7 - pkgs/applications/graphics/weylus/default.nix | 10 - pkgs/applications/misc/audio/sox/default.nix | 4 +- pkgs/applications/misc/binocle/default.nix | 17 - pkgs/applications/misc/diff-pdf/default.nix | 3 +- .../misc/eureka-ideas/default.nix | 14 +- pkgs/applications/misc/far2l/default.nix | 16 +- pkgs/applications/misc/gkrellm/default.nix | 3 +- .../misc/inherd-quake/default.nix | 14 +- pkgs/applications/misc/inlyne/default.nix | 25 +- .../misc/klipper-estimator/default.nix | 4 - pkgs/applications/misc/mdzk/default.nix | 3 - pkgs/applications/misc/opencpn/default.nix | 4 - pkgs/applications/misc/pastel/default.nix | 4 - pkgs/applications/misc/pomodoro/default.nix | 2 - .../misc/prusa-slicer/default.nix | 4 - pkgs/applications/misc/pueue/default.nix | 4 - pkgs/applications/misc/reddsaver/default.nix | 4 +- pkgs/applications/misc/redshift/default.nix | 10 - pkgs/applications/misc/stork/default.nix | 4 +- pkgs/applications/misc/survex/default.nix | 6 - pkgs/applications/misc/synergy/default.nix | 15 - .../misc/terminal-typeracer/default.nix | 2 - pkgs/applications/misc/wordnet/default.nix | 3 +- .../networking/browsers/asuka/default.nix | 4 +- .../networking/browsers/lagrange/default.nix | 4 +- .../kubectl-view-allocations/default.nix | 3 - .../networking/cluster/minikube/default.nix | 9 +- .../feedreaders/tuifeed/default.nix | 4 - .../networking/ftp/filezilla/default.nix | 37 +- .../networking/gopher/phetch/default.nix | 4 +- .../instant-messengers/twitch-tui/default.nix | 16 +- .../networking/irc/tiny/default.nix | 6 +- .../mailreaders/sylpheed/default.nix | 6 +- .../applications/networking/mhost/default.nix | 8 - pkgs/applications/networking/mpop/default.nix | 4 +- .../applications/networking/msmtp/default.nix | 14 +- .../networking/mujmap/default.nix | 4 +- .../networking/p2p/synapse-bt/default.nix | 10 +- .../networking/p2p/transmission/4.nix | 1 - .../applications/networking/pjsip/default.nix | 18 +- .../networking/remote/putty/default.nix | 11 +- .../networking/rymdport/default.nix | 30 +- .../networking/sniffers/wireshark/default.nix | 4 - pkgs/applications/office/jameica/default.nix | 13 +- pkgs/applications/radio/cubicsdr/default.nix | 6 - pkgs/applications/radio/limesuite/default.nix | 4 - pkgs/applications/radio/qlog/default.nix | 4 +- pkgs/applications/radio/sdrpp/default.nix | 2 - .../radio/soapyairspy/default.nix | 4 - .../applications/radio/soapyaudio/default.nix | 6 - .../radio/soapybladerf/default.nix | 4 - .../radio/soapyhackrf/default.nix | 4 - .../radio/soapyrtlsdr/default.nix | 4 - pkgs/applications/radio/soapyuhd/default.nix | 4 - .../science/biology/ants/default.nix | 13 +- .../science/biology/blast/default.nix | 3 +- .../finalfrontier/default.nix | 2 - .../finalfusion-utils/default.nix | 18 +- pkgs/applications/science/math/R/default.nix | 4 - .../science/math/caffe/default.nix | 8 - .../science/misc/rink/default.nix | 2 - .../version-management/git-gone/default.nix | 4 - .../version-management/git-stack/default.nix | 6 - .../version-management/git/default.nix | 6 - .../version-management/gittyup/default.nix | 29 +- .../lucky-commit/default.nix | 3 +- .../version-management/mercurial/default.nix | 3 +- .../version-management/p4/default.nix | 9 - .../version-management/sapling/default.nix | 12 - .../version-management/subversion/default.nix | 2 - pkgs/applications/video/go2tv/default.nix | 32 +- .../video/jellyfin-media-player/default.nix | 10 - pkgs/applications/video/mplayer/default.nix | 7 +- .../video/olive-editor/default.nix | 3 +- .../video/youtube-tui/default.nix | 21 +- .../virtualization/xhyve/default.nix | 6 - pkgs/build-support/mitm-cache/default.nix | 6 - .../wasm-bindgen-cli/default.nix | 2 - pkgs/by-name/ad/adguardian/package.nix | 6 - pkgs/by-name/ae/aemu/package.nix | 4 - pkgs/by-name/ai/aiken/package.nix | 13 +- pkgs/by-name/am/amber-secret/package.nix | 4 - pkgs/by-name/am/amp/package.nix | 12 +- pkgs/by-name/ar/artem/package.nix | 6 - pkgs/by-name/as/asciinema-agg/package.nix | 9 - pkgs/by-name/at/attic-client/package.nix | 16 +- pkgs/by-name/au/authoscope/package.nix | 16 +- pkgs/by-name/au/autotrace/package.nix | 17 +- pkgs/by-name/az/azurite/package.nix | 15 +- pkgs/by-name/ba/bandwhich/package.nix | 3 - pkgs/by-name/bi/bigloo/package.nix | 2 - pkgs/by-name/bi/bind/package.nix | 4 +- pkgs/by-name/bi/binsider/package.nix | 9 - pkgs/by-name/bl/blender/package.nix | 10 - pkgs/by-name/bo/boa/package.nix | 17 +- pkgs/by-name/bo/boringtun/package.nix | 4 - pkgs/by-name/br/browsers/package.nix | 25 +- pkgs/by-name/bu/bunbun/package.nix | 11 - pkgs/by-name/bw/bws/package.nix | 4 - pkgs/by-name/ca/cairo/package.nix | 17 +- pkgs/by-name/ca/cargo-about/package.nix | 9 +- pkgs/by-name/ca/cargo-binstall/package.nix | 16 +- .../by-name/ca/cargo-bisect-rustc/package.nix | 8 +- pkgs/by-name/ca/cargo-bump/package.nix | 6 - pkgs/by-name/ca/cargo-bundle/package.nix | 13 +- pkgs/by-name/ca/cargo-component/package.nix | 12 +- pkgs/by-name/ca/cargo-deny/package.nix | 13 +- pkgs/by-name/ca/cargo-dephell/package.nix | 2 - pkgs/by-name/ca/cargo-dist/package.nix | 16 +- pkgs/by-name/ca/cargo-duplicates/package.nix | 18 +- pkgs/by-name/ca/cargo-geiger/package.nix | 16 +- pkgs/by-name/ca/cargo-generate/package.nix | 13 +- pkgs/by-name/ca/cargo-guppy/package.nix | 8 +- pkgs/by-name/ca/cargo-info/package.nix | 12 +- pkgs/by-name/ca/cargo-leptos/package.nix | 17 - .../ca/cargo-local-registry/package.nix | 21 +- pkgs/by-name/ca/cargo-make/package.nix | 14 +- pkgs/by-name/ca/cargo-mobile2/package.nix | 5 +- pkgs/by-name/ca/cargo-public-api/package.nix | 4 +- pkgs/by-name/ca/cargo-raze/package.nix | 3 +- pkgs/by-name/ca/cargo-rdme/package.nix | 6 - pkgs/by-name/ca/cargo-release/package.nix | 2 - .../ca/cargo-semver-checks/package.nix | 12 +- pkgs/by-name/ca/cargo-shuttle/package.nix | 15 +- .../by-name/ca/cargo-supply-chain/package.nix | 6 - pkgs/by-name/ca/cargo-tally/package.nix | 11 - pkgs/by-name/ca/cargo-ui/package.nix | 4 - .../ca/cargo-unused-features/package.nix | 17 +- pkgs/by-name/ca/cargo-update/package.nix | 2 - pkgs/by-name/ca/cargo-vibe/package.nix | 19 +- pkgs/by-name/ca/cargo-wasi/package.nix | 5 +- pkgs/by-name/ca/cargo-workspaces/package.nix | 17 +- pkgs/by-name/ce/cegui/package.nix | 3 - pkgs/by-name/ce/celeste/package.nix | 28 +- pkgs/by-name/ce/certinfo/package.nix | 6 +- pkgs/by-name/ch/chainsaw/package.nix | 6 - pkgs/by-name/ch/chatgpt/package.nix | 1 - pkgs/by-name/ch/checkpwn/package.nix | 6 - pkgs/by-name/ch/cherrybomb/package.nix | 6 - pkgs/by-name/ch/chit/package.nix | 11 +- pkgs/by-name/ch/chromaprint/package.nix | 13 +- pkgs/by-name/ci/citations/package.nix | 19 +- pkgs/by-name/cl/clfft/package.nix | 5 +- pkgs/by-name/cl/click/package.nix | 5 +- pkgs/by-name/cl/clima/package.nix | 6 - pkgs/by-name/cl/clipboard-jh/package.nix | 4 - pkgs/by-name/cl/clipcat/package.nix | 7 - pkgs/by-name/cm/cmake/package.nix | 6 +- pkgs/by-name/cm/cminpack/package.nix | 13 +- pkgs/by-name/co/code2prompt/package.nix | 9 +- pkgs/by-name/co/codeberg-cli/package.nix | 14 +- pkgs/by-name/co/coinlive/package.nix | 12 +- pkgs/by-name/co/conserve/package.nix | 6 - pkgs/by-name/co/convco/package.nix | 2 - pkgs/by-name/co/cook-cli/package.nix | 4 +- pkgs/by-name/co/copycat/package.nix | 6 - pkgs/by-name/cr/crabfit-api/package.nix | 16 +- pkgs/by-name/cs/csvlens/package.nix | 6 - pkgs/by-name/cu/curlMinimal/package.nix | 11 +- pkgs/by-name/cy/cypress/package.nix | 43 +- pkgs/by-name/cz/czkawka/package.nix | 25 +- pkgs/by-name/da/dailies/package.nix | 9 +- pkgs/by-name/da/daktilo/package.nix | 18 +- pkgs/by-name/da/darklua/package.nix | 6 - pkgs/by-name/da/datafusion-cli/package.nix | 6 - pkgs/by-name/de/deltachat-desktop/package.nix | 5 - pkgs/by-name/de/deploy-rs/package.nix | 7 - pkgs/by-name/de/dezoomify-rs/package.nix | 1 - pkgs/by-name/di/diebahn/package.nix | 28 +- pkgs/by-name/di/dim/package.nix | 10 +- pkgs/by-name/di/diswall/package.nix | 9 - pkgs/by-name/dm/dmd/generic.nix | 13 +- pkgs/by-name/do/dockutil/package.nix | 3 - pkgs/by-name/do/doctave/package.nix | 6 - pkgs/by-name/do/docuum/package.nix | 6 - pkgs/by-name/do/dogedns/package.nix | 5 +- pkgs/by-name/do/done/package.nix | 21 +- pkgs/by-name/do/doomretro/package.nix | 6 +- pkgs/by-name/do/dotter/package.nix | 5 - pkgs/by-name/dp/dpkg/package.nix | 3 +- pkgs/by-name/dt/dtool/package.nix | 6 - pkgs/by-name/du/dufs/package.nix | 5 - pkgs/by-name/du/dumbpipe/package.nix | 9 - pkgs/by-name/du/dummyhttp/package.nix | 6 - pkgs/by-name/dv/dvdplusrwtools/package.nix | 6 +- pkgs/by-name/ea/easytier/package.nix | 5 - pkgs/by-name/ed/edge-runtime/package.nix | 12 +- pkgs/by-name/ed/eduke32/package.nix | 13 - pkgs/by-name/em/emblem/package.nix | 13 +- pkgs/by-name/en/envio/package.nix | 7 +- pkgs/by-name/es/espflash/package.nix | 8 - pkgs/by-name/es/espup/package.nix | 19 +- pkgs/by-name/et/eternal-terminal/package.nix | 1 - pkgs/by-name/ex/exempi/package.nix | 2 - pkgs/by-name/ez/ezno/package.nix | 6 - pkgs/by-name/fa/faircamp/package.nix | 16 +- pkgs/by-name/fh/fh/package.nix | 3 - pkgs/by-name/fi/fido2-manage/package.nix | 3 - pkgs/by-name/fi/filen-cli/package.nix | 8 +- pkgs/by-name/fi/fim-rs/package.nix | 17 +- pkgs/by-name/fi/findomain/package.nix | 12 +- pkgs/by-name/fl/flake-checker/package.nix | 10 - pkgs/by-name/fl/flake-edit/package.nix | 9 +- pkgs/by-name/fl/flameshot/package.nix | 1 - pkgs/by-name/fl/fluidsynth/package.nix | 13 +- pkgs/by-name/fo/formatjson5/package.nix | 4 - pkgs/by-name/fo/fortune-kind/package.nix | 2 - pkgs/by-name/fr/freealut/package.nix | 3 +- pkgs/by-name/fr/fretboard/package.nix | 15 +- .../fu/functiontrace-server/package.nix | 6 - pkgs/by-name/fu/funzzy/package.nix | 6 - pkgs/by-name/fu/furnace/package.nix | 9 +- pkgs/by-name/fw/fw/package.nix | 16 +- pkgs/by-name/fy/fyne/package.nix | 30 +- pkgs/by-name/g3/g3proxy/package.nix | 14 +- pkgs/by-name/ga/gambit-project/package.nix | 5 +- pkgs/by-name/gd/gdlv/package.nix | 12 - pkgs/by-name/gd/gdrive3/package.nix | 6 - pkgs/by-name/ge/gen-license/package.nix | 6 - pkgs/by-name/ge/gex/package.nix | 12 +- pkgs/by-name/gf/gfxstream/package.nix | 25 +- pkgs/by-name/gh/ghciwatch/package.nix | 7 - pkgs/by-name/gh/ghostie/package.nix | 13 +- pkgs/by-name/gi/gildas/package.nix | 4 +- pkgs/by-name/gi/gimoji/package.nix | 6 - pkgs/by-name/gi/girouette/package.nix | 14 +- pkgs/by-name/gi/git-agecrypt/package.nix | 4 +- pkgs/by-name/gi/git-chain/package.nix | 11 +- pkgs/by-name/gi/git-dive/package.nix | 16 +- pkgs/by-name/gi/git-gr/package.nix | 3 - pkgs/by-name/gi/git-igitt/package.nix | 4 +- pkgs/by-name/gi/git-ignore/package.nix | 6 - pkgs/by-name/gi/git-mit/package.nix | 16 +- pkgs/by-name/gi/git-together/package.nix | 4 +- pkgs/by-name/gi/git-wait/package.nix | 6 - pkgs/by-name/gi/gitlab-ci-ls/package.nix | 8 +- pkgs/by-name/gi/gitlab-timelogs/package.nix | 2 - pkgs/by-name/gi/gitnr/package.nix | 4 - pkgs/by-name/gi/gitrs/package.nix | 3 - pkgs/by-name/gi/gitu/package.nix | 17 +- pkgs/by-name/gi/gitui/package.nix | 3 - pkgs/by-name/gl/gl2ps/package.nix | 4 - pkgs/by-name/gl/glib/package.nix | 14 +- pkgs/by-name/gl/glicol-cli/package.nix | 11 +- pkgs/by-name/gl/globalplatform/package.nix | 4 - pkgs/by-name/gl/glrnvim/package.nix | 10 - pkgs/by-name/gm/gmt/package.nix | 20 +- pkgs/by-name/gn/gn/generic.nix | 19 +- pkgs/by-name/go/go-ethereum/package.nix | 2 - pkgs/by-name/go/gobang/package.nix | 10 - pkgs/by-name/go/gossip/package.nix | 9 - pkgs/by-name/gp/gptscript/package.nix | 4 - pkgs/by-name/gr/gridlock/package.nix | 12 +- pkgs/by-name/gu/gurk-rs/package.nix | 6 +- pkgs/by-name/ha/halp/package.nix | 5 - pkgs/by-name/ha/handbrake/package.nix | 8 - pkgs/by-name/ha/haylxon/package.nix | 4 - pkgs/by-name/he/health/package.nix | 16 +- pkgs/by-name/he/hebbot/package.nix | 12 +- pkgs/by-name/ho/hoard/package.nix | 12 +- .../by-name/ho/homepage-dashboard/package.nix | 3 +- pkgs/by-name/ht/htb-toolkit/package.nix | 5 - pkgs/by-name/ht/htop-vim/package.nix | 2 - pkgs/by-name/ht/httplz/package.nix | 8 +- pkgs/by-name/hy/hydra-cli/package.nix | 4 +- pkgs/by-name/ic/icon-library/package.nix | 19 +- pkgs/by-name/id/idutils/package.nix | 11 +- pkgs/by-name/im/implot/demos/default.nix | 22 +- pkgs/by-name/im/imtui/package.nix | 4 +- pkgs/by-name/in/intelli-shell/package.nix | 18 +- pkgs/by-name/ir/iroh/package.nix | 10 - pkgs/by-name/ja/jasper/package.nix | 4 - pkgs/by-name/je/jen/package.nix | 6 - .../ji/jitsi-meet-electron/package.nix | 30 +- pkgs/by-name/jo/josh/package.nix | 14 +- pkgs/by-name/jo/joshuto/package.nix | 5 - pkgs/by-name/ju/jumpy/package.nix | 2 - pkgs/by-name/ka/kakoune-lsp/package.nix | 10 - pkgs/by-name/ka/kana/package.nix | 6 +- pkgs/by-name/ka/kanha/package.nix | 13 +- pkgs/by-name/kb/kbt/package.nix | 11 +- pkgs/by-name/kc/kcl/package.nix | 15 +- pkgs/by-name/kc/kclvm/package.nix | 9 +- pkgs/by-name/kc/kclvm_cli/package.nix | 16 +- pkgs/by-name/ke/kepler/package.nix | 16 +- pkgs/by-name/ki/kitty/package.nix | 12 - pkgs/by-name/ko/komac/package.nix | 18 +- pkgs/by-name/ko/kord/package.nix | 5 +- pkgs/by-name/kt/kty/package.nix | 15 +- pkgs/by-name/ku/kubetui/package.nix | 9 - pkgs/by-name/la/lazymc/package.nix | 6 - pkgs/by-name/la/lazysql/package.nix | 4 +- pkgs/by-name/ld/ldc/package.nix | 4 - pkgs/by-name/le/leaf/package.nix | 7 - pkgs/by-name/le/leetcode-cli/package.nix | 16 +- pkgs/by-name/le/legba/package.nix | 14 +- pkgs/by-name/le/lenmus/package.nix | 34 +- pkgs/by-name/li/libaribcaption/package.nix | 19 +- pkgs/by-name/li/libass/package.nix | 4 - pkgs/by-name/li/libclipboard/package.nix | 3 +- pkgs/by-name/li/libdeltachat/package.nix | 4 - pkgs/by-name/li/libdiscid/package.nix | 3 - pkgs/by-name/li/libfreefare/package.nix | 1 - pkgs/by-name/li/libhv/package.nix | 3 +- pkgs/by-name/li/libproxy/package.nix | 16 +- pkgs/by-name/li/libremidi/package.nix | 22 +- pkgs/by-name/li/libserialport/package.nix | 5 +- pkgs/by-name/li/libsignal-ffi/package.nix | 3 - pkgs/by-name/li/libtiger/package.nix | 3 +- .../li/libtorrent-rasterbar-1_2_x/package.nix | 3 +- .../li/libtorrent-rasterbar-2_0_x/package.nix | 3 +- pkgs/by-name/li/libui-ng/package.nix | 4 - pkgs/by-name/li/libusbsio/package.nix | 10 +- pkgs/by-name/li/licensure/package.nix | 16 +- pkgs/by-name/li/live-server/package.nix | 12 +- pkgs/by-name/ll/llama-cpp/package.nix | 13 +- pkgs/by-name/ll/llpp/package.nix | 5 - pkgs/by-name/lo/loudmouth/package.nix | 9 - pkgs/by-name/lo/lowfi/package.nix | 1 - pkgs/by-name/lr/lrcget/package.nix | 5 - pkgs/by-name/ls/lsp-ai/package.nix | 15 +- pkgs/by-name/lu/luanti/package.nix | 6 - pkgs/by-name/lu/lunatic/package.nix | 12 +- pkgs/by-name/m1/m1ddc/package.nix | 6 - pkgs/by-name/ma/maa-cli/package.nix | 11 +- pkgs/by-name/ma/macchina/package.nix | 7 - pkgs/by-name/ma/markuplinkchecker/package.nix | 12 +- .../matrix-authentication-service/package.nix | 15 +- .../ma/matrix-commander-rs/package.nix | 9 +- pkgs/by-name/ma/matrix-conduit/package.nix | 14 +- pkgs/by-name/ma/maturin/package.nix | 2 - pkgs/by-name/mc/mchprs/package.nix | 18 +- pkgs/by-name/mc/mcumgr-client/package.nix | 5 +- pkgs/by-name/md/md-tui/package.nix | 8 - pkgs/by-name/md/mdbook-d2/package.nix | 7 - pkgs/by-name/md/mdbook-emojicodes/package.nix | 6 - .../md/mdbook-kroki-preprocessor/package.nix | 13 +- pkgs/by-name/md/mdbook/package.nix | 4 - pkgs/by-name/me/metronome/package.nix | 17 +- pkgs/by-name/mi/microbin/package.nix | 14 +- pkgs/by-name/mi/microserver/package.nix | 6 - pkgs/by-name/mi/miniserve/package.nix | 6 - pkgs/by-name/mi/mise/package.nix | 10 +- pkgs/by-name/mk/mkalias/package.nix | 5 - pkgs/by-name/mo/mollysocket/package.nix | 14 +- pkgs/by-name/mo/monit/package.nix | 14 +- pkgs/by-name/mo/moonfire-nvr/package.nix | 16 +- pkgs/by-name/mo/movine/package.nix | 12 +- pkgs/by-name/mo/movit/package.nix | 1 - pkgs/by-name/mp/mpd-discord-rpc/package.nix | 13 +- pkgs/by-name/mp/mpris-notifier/package.nix | 6 - pkgs/by-name/mq/mqttui/package.nix | 4 - pkgs/by-name/mu/mupdf/package.nix | 18 +- pkgs/by-name/mu/music-player/package.nix | 11 +- pkgs/by-name/mu/musikcube/package.nix | 10 - pkgs/by-name/mv/mvnd/package.nix | 3 +- pkgs/by-name/my/mycelium/package.nix | 6 - pkgs/by-name/my/mysql84/package.nix | 1 - pkgs/by-name/na/narrowlink/package.nix | 7 - pkgs/by-name/nb/nbtscanner/package.nix | 4 - pkgs/by-name/nc/nchat/package.nix | 26 +- pkgs/by-name/ne/neko/package.nix | 32 +- pkgs/by-name/ne/nest-cli/package.nix | 6 - pkgs/by-name/ne/net-snmp/package.nix | 11 +- pkgs/by-name/ne/netbox2netshot/package.nix | 13 +- pkgs/by-name/ne/neverest/package.nix | 13 +- pkgs/by-name/ne/newsboat/package.nix | 14 +- pkgs/by-name/nh/nh/package.nix | 6 - pkgs/by-name/ni/nim-2_2/package.nix | 1 - pkgs/by-name/ni/nim-unwrapped-2_2/package.nix | 2 +- pkgs/by-name/ni/nix-btm/package.nix | 10 - pkgs/by-name/ni/nix-health/package.nix | 20 +- pkgs/by-name/ni/nix-weather/package.nix | 3 - pkgs/by-name/ni/nix-web/package.nix | 11 +- pkgs/by-name/ni/nixci/package.nix | 15 +- pkgs/by-name/ni/nixdoc/package.nix | 4 - pkgs/by-name/ni/nixtract/package.nix | 2 - pkgs/by-name/no/nodehun/package.nix | 5 - pkgs/by-name/no/nostr-rs-relay/package.nix | 3 - pkgs/by-name/no/nostui/package.nix | 6 - pkgs/by-name/no/notes/package.nix | 13 +- pkgs/by-name/no/novops/package.nix | 2 - pkgs/by-name/no/nowplaying-cli/package.nix | 7 - pkgs/by-name/np/npins/package.nix | 9 - pkgs/by-name/nu/nurl/package.nix | 6 - pkgs/by-name/od/ode/package.nix | 6 - pkgs/by-name/oh/oha/package.nix | 11 +- pkgs/by-name/ol/ollama/package.nix | 14 +- pkgs/by-name/op/open-scq30/package.nix | 27 +- pkgs/by-name/op/openboardview/package.nix | 18 +- pkgs/by-name/op/opencascade-occt/package.nix | 3 +- pkgs/by-name/op/openctm/package.nix | 12 +- pkgs/by-name/op/openimagedenoise/package.nix | 10 +- pkgs/by-name/op/openpgp-ca/package.nix | 23 +- pkgs/by-name/op/opensaml-cpp/package.nix | 27 +- pkgs/by-name/op/opensubdiv/package.nix | 14 +- pkgs/by-name/op/openturns/package.nix | 7 - pkgs/by-name/op/openvr/package.nix | 15 +- pkgs/by-name/or/oranda/package.nix | 12 +- pkgs/by-name/or/ord/package.nix | 13 +- pkgs/by-name/or/orogene/package.nix | 12 +- pkgs/by-name/os/osxsnarf/package.nix | 2 - pkgs/by-name/ow/owl-compositor/package.nix | 3 - pkgs/by-name/ow/owmods-cli/package.nix | 5 - pkgs/by-name/ox/oxide-rs/package.nix | 19 +- pkgs/by-name/ox/oxlint/package.nix | 12 +- pkgs/by-name/p2/p2pool/package.nix | 6 +- pkgs/by-name/pa/panamax/package.nix | 17 +- pkgs/by-name/pa/panotools/package.nix | 15 +- pkgs/by-name/pa/paper-plane/package.nix | 25 +- pkgs/by-name/pa/paperless-ngx/package.nix | 2 - pkgs/by-name/pa/papers/package.nix | 4 - pkgs/by-name/pa/partio/package.nix | 5 - pkgs/by-name/pa/pazi/package.nix | 4 - pkgs/by-name/pe/pest-ide-tools/package.nix | 5 - pkgs/by-name/pf/pfetch-rs/package.nix | 7 - pkgs/by-name/pg/pgcat/package.nix | 6 - pkgs/by-name/pi/picocom/package.nix | 3 +- pkgs/by-name/pi/pict-rs/package.nix | 2 - pkgs/by-name/pi/pijul/package.nix | 21 +- pkgs/by-name/pi/pilot-link/package.nix | 4 +- pkgs/by-name/pi/piv-agent/package.nix | 4 +- pkgs/by-name/pk/pkarr/package.nix | 10 - pkgs/by-name/pl/plink-ng/package.nix | 18 +- pkgs/by-name/po/porsmo/package.nix | 13 +- pkgs/by-name/pr/process-viewer/package.nix | 8 +- pkgs/by-name/pr/projectable/package.nix | 16 +- .../pr/prometheus-node-exporter/package.nix | 10 - pkgs/by-name/pr/proto/package.nix | 2 - pkgs/by-name/pr/prr/package.nix | 9 +- pkgs/by-name/ps/pstoedit/package.nix | 11 +- pkgs/by-name/pw/pwsafe/package.nix | 7 - pkgs/by-name/qg/qgrep/package.nix | 6 - pkgs/by-name/r0/r0vm/package.nix | 12 +- pkgs/by-name/ra/radicle-httpd/package.nix | 2 - pkgs/by-name/ra/radicle-node/package.nix | 4 - pkgs/by-name/ra/rage/package.nix | 5 - pkgs/by-name/ra/railway/package.nix | 13 +- pkgs/by-name/ra/rainfrog/package.nix | 11 - pkgs/by-name/ra/rapidsvn/package.nix | 19 +- pkgs/by-name/ra/rates/package.nix | 4 - pkgs/by-name/ra/raylib-games/package.nix | 6 +- pkgs/by-name/rc/rcp/package.nix | 8 - pkgs/by-name/re/realm/package.nix | 6 - pkgs/by-name/re/reason-shell/package.nix | 12 +- pkgs/by-name/re/rebuilderd/package.nix | 22 +- pkgs/by-name/re/redlib/package.nix | 6 - pkgs/by-name/re/refinery-cli/package.nix | 4 +- pkgs/by-name/re/reshape/package.nix | 6 - pkgs/by-name/re/restic-browser/package.nix | 16 +- pkgs/by-name/re/restish/package.nix | 20 +- pkgs/by-name/re/rewrk/package.nix | 6 - pkgs/by-name/ri/riff/package.nix | 12 +- pkgs/by-name/ri/ripunzip/package.nix | 12 +- pkgs/by-name/ro/rojo/package.nix | 15 +- pkgs/by-name/ro/routinator/package.nix | 10 - pkgs/by-name/rr/rrdtool/package.nix | 2 - pkgs/by-name/rt/rtaudio_6/package.nix | 4 - pkgs/by-name/rt/rtz/package.nix | 17 +- pkgs/by-name/ru/rubberband/package.nix | 26 +- pkgs/by-name/ru/ruffle/package.nix | 19 +- .../ru/rune-languageserver/package.nix | 6 - pkgs/by-name/ru/rune/package.nix | 7 - pkgs/by-name/ru/runiq/package.nix | 6 - pkgs/by-name/ru/runit/package.nix | 11 +- pkgs/by-name/ru/russ/package.nix | 10 - pkgs/by-name/ru/rust-traverse/package.nix | 14 +- pkgs/by-name/ru/rustcat/package.nix | 4 - pkgs/by-name/ru/rustdesk-server/package.nix | 14 +- pkgs/by-name/ru/rustdesk/package.nix | 15 +- pkgs/by-name/ru/rusti-cal/package.nix | 6 - pkgs/by-name/ru/rustic/package.nix | 8 - pkgs/by-name/ru/rustlings/package.nix | 6 - pkgs/by-name/ru/rustls-ffi/package.nix | 2 - pkgs/by-name/ru/rustmission/package.nix | 10 +- pkgs/by-name/ru/rustus/package.nix | 14 +- pkgs/by-name/ru/rustycli/package.nix | 6 - pkgs/by-name/ru/rustypaste-cli/package.nix | 6 - pkgs/by-name/ru/rustypaste/package.nix | 6 - pkgs/by-name/ru/rustywind/package.nix | 6 - pkgs/by-name/sa/safecloset/package.nix | 11 +- pkgs/by-name/sa/saga/package.nix | 2 - pkgs/by-name/sa/sagoin/package.nix | 6 - pkgs/by-name/sa/sampler/package.nix | 7 +- pkgs/by-name/sa/samply/package.nix | 6 - pkgs/by-name/sc/sccache/package.nix | 13 +- pkgs/by-name/sc/schemamap/package.nix | 14 +- pkgs/by-name/sc/screenly-cli/package.nix | 11 +- pkgs/by-name/sc/scryer-prolog/package.nix | 8 +- pkgs/by-name/sd/SDL2_classic/package.nix | 16 +- pkgs/by-name/sd/SDL2_image/package.nix | 6 +- pkgs/by-name/sd/SDL2_mixer/package.nix | 10 - pkgs/by-name/sd/SDL2_sound/package.nix | 26 +- pkgs/by-name/sd/SDL_compat/package.nix | 2 - pkgs/by-name/sd/sdl3-image/package.nix | 3 +- pkgs/by-name/se/selene/package.nix | 12 +- pkgs/by-name/se/selenium-manager/package.nix | 6 - pkgs/by-name/se/sendme/package.nix | 9 - pkgs/by-name/se/sequoia-sq/package.nix | 20 +- pkgs/by-name/se/sequoia-wot/package.nix | 5 - pkgs/by-name/se/serie/package.nix | 10 - pkgs/by-name/sh/share-preview/package.nix | 14 +- pkgs/by-name/sh/shibboleth-sp/package.nix | 29 +- pkgs/by-name/sh/shotcut/package.nix | 3 +- pkgs/by-name/si/silicon/package.nix | 13 +- .../by-name/si/simple-http-server/package.nix | 8 +- pkgs/by-name/sl/slint-lsp/package.nix | 13 - pkgs/by-name/sl/slippy/package.nix | 12 +- pkgs/by-name/sl/slowlorust/package.nix | 4 - pkgs/by-name/sl/slumber/package.nix | 4 - pkgs/by-name/sm/smartcat/package.nix | 14 +- pkgs/by-name/sm/smc-fuzzer/package.nix | 2 - pkgs/by-name/sn/sn0int/package.nix | 3 - pkgs/by-name/sn/sniffnet/package.nix | 2 - pkgs/by-name/so/so/package.nix | 5 - pkgs/by-name/so/soapyplutosdr/package.nix | 2 - pkgs/by-name/so/solana-cli/package.nix | 14 - pkgs/by-name/so/sozu/package.nix | 3 - pkgs/by-name/sp/speedtest-rs/package.nix | 8 +- pkgs/by-name/sq/sql-studio/package.nix | 4 - pkgs/by-name/sq/sqld/package.nix | 4 +- pkgs/by-name/sq/sqruff/package.nix | 3 +- pkgs/by-name/sq/squawk/package.nix | 17 +- pkgs/by-name/sq/squeezelite/package.nix | 13 +- pkgs/by-name/sr/src-cli/package.nix | 11 +- pkgs/by-name/ss/ssh-openpgp-auth/generic.nix | 19 +- pkgs/by-name/st/stabber/package.nix | 3 +- pkgs/by-name/st/stalwart-mail/package.nix | 20 +- pkgs/by-name/st/star-history/package.nix | 8 +- pkgs/by-name/st/starry/package.nix | 12 +- pkgs/by-name/st/static-web-server/package.nix | 4 - pkgs/by-name/st/step-ca/package.nix | 5 +- pkgs/by-name/st/stormlib/package.nix | 15 +- pkgs/by-name/st/strongswan/package.nix | 4 - pkgs/by-name/su/subxt/package.nix | 6 - pkgs/by-name/su/supersonic/package.nix | 8 - pkgs/by-name/su/surfer/package.nix | 11 +- pkgs/by-name/su/surrealdb/package.nix | 4 +- pkgs/by-name/sv/svix-server/package.nix | 15 +- pkgs/by-name/sw/swim/package.nix | 13 +- pkgs/by-name/sw/switcheroo/package.nix | 15 +- pkgs/by-name/sy/symbolicator/package.nix | 17 +- pkgs/by-name/sy/synfigstudio/package.nix | 37 +- pkgs/by-name/sz/szyszka/package.nix | 25 +- pkgs/by-name/t-/t-rex/package.nix | 4 +- pkgs/by-name/ta/taizen/package.nix | 14 +- pkgs/by-name/ta/talecast/package.nix | 4 +- .../ta/taler-depolymerization/package.nix | 11 - pkgs/by-name/ta/taplo/package.nix | 13 +- pkgs/by-name/te/telepathy-logger/package.nix | 20 +- pkgs/by-name/te/teller/package.nix | 4 +- pkgs/by-name/te/termbook/package.nix | 11 +- pkgs/by-name/th/the-powder-toy/package.nix | 3 +- pkgs/by-name/th/the-way/package.nix | 6 - pkgs/by-name/ti/tickrs/package.nix | 14 +- pkgs/by-name/ti/tio/package.nix | 3 +- pkgs/by-name/tl/tlrc/package.nix | 6 - pkgs/by-name/tp/tpnote/package.nix | 17 +- pkgs/by-name/tr/tracy/package.nix | 7 +- pkgs/by-name/tr/transmission-rss/package.nix | 12 +- pkgs/by-name/tr/tre/package.nix | 1 - pkgs/by-name/tr/trunk-ng/package.nix | 6 - pkgs/by-name/tt/ttfb/package.nix | 6 - pkgs/by-name/tu/tui-journal/package.nix | 17 +- pkgs/by-name/tw/twitch-hls-client/package.nix | 6 - pkgs/by-name/ty/typst-live/package.nix | 6 - pkgs/by-name/ud/udict/package.nix | 13 +- pkgs/by-name/va/vale-ls/package.nix | 14 +- pkgs/by-name/vc/vcdimager/package.nix | 19 +- pkgs/by-name/ve/veryl/package.nix | 14 +- pkgs/by-name/vi/vips/package.nix | 65 +- pkgs/by-name/vi/virtualpg/package.nix | 3 +- pkgs/by-name/vi/visp/package.nix | 4 +- pkgs/by-name/vl/vlang/package.nix | 4 - pkgs/by-name/vr/vrpn/package.nix | 16 +- pkgs/by-name/vs/vscode-js-debug/package.nix | 9 +- .../vs/vsmartcard-pcsc-relay/package.nix | 33 +- pkgs/by-name/vs/vsmartcard-vpcd/package.nix | 31 +- pkgs/by-name/vv/vvvvvv/package.nix | 19 +- pkgs/by-name/wa/wapm/package.nix | 18 +- pkgs/by-name/wa/wash-cli/package.nix | 9 +- pkgs/by-name/wa/wasm-pack/package.nix | 6 +- pkgs/by-name/wa/wasmer-pack/package.nix | 6 - pkgs/by-name/wa/wastebin/package.nix | 14 +- pkgs/by-name/we/websocat/package.nix | 2 - pkgs/by-name/wg/wget2/package.nix | 4 - pkgs/by-name/wg/wgpu-utils/package.nix | 19 +- pkgs/by-name/wi/widelands/package.nix | 45 +- pkgs/by-name/wi/wiper/package.nix | 4 - pkgs/by-name/wo/wownero/package.nix | 23 +- pkgs/by-name/wt/wthrr/package.nix | 14 +- pkgs/by-name/wt/wttrbar/package.nix | 10 - pkgs/by-name/wx/wxformbuilder/package.nix | 12 +- pkgs/by-name/x3/x3270/package.nix | 2 - pkgs/by-name/x4/x4/package.nix | 14 +- pkgs/by-name/xc/xcbuild/package.nix | 5 - pkgs/by-name/xi/xiu/package.nix | 4 - pkgs/by-name/xm/xml-security-c/package.nix | 20 +- pkgs/by-name/xq/xqilla/package.nix | 15 +- pkgs/by-name/ya/yazi-unwrapped/package.nix | 4 +- pkgs/by-name/yc/ycmd/package.nix | 4 +- pkgs/by-name/yt/ytui-music/package.nix | 17 +- pkgs/by-name/yu/yubico-piv-tool/package.nix | 3 +- pkgs/by-name/yu/yubihsm-shell/package.nix | 2 - pkgs/by-name/yu/yubikey-agent/package.nix | 5 +- pkgs/by-name/ze/zerotierone/package.nix | 3 - pkgs/by-name/zi/zine/package.nix | 12 +- pkgs/by-name/zo/zola/package.nix | 15 +- .../ada-modules/gnatcoll/bindings.nix | 5 - .../compilers/chicken/5/overrides.nix | 26 +- pkgs/development/compilers/dotnet/vmr.nix | 26 +- pkgs/development/compilers/dotnet/wrapper.nix | 15 +- .../elm/packages/elm-json/default.nix | 4 +- .../elm/packages/elm-test-rs/default.nix | 11 +- .../compilers/gcc/common/dependencies.nix | 6 +- .../community-edition/buildGraalvmProduct.nix | 14 +- pkgs/development/compilers/haxe/default.nix | 2 - pkgs/development/compilers/kind2/default.nix | 6 - pkgs/development/compilers/ligo/default.nix | 145 +- .../development/compilers/lobster/default.nix | 28 +- pkgs/development/compilers/mono/4.nix | 7 +- pkgs/development/compilers/mono/5.nix | 7 +- pkgs/development/compilers/mono/6.nix | 7 +- pkgs/development/compilers/mono/generic.nix | 2 - pkgs/development/compilers/rust/binary.nix | 12 +- pkgs/development/compilers/rust/rustc.nix | 3 - .../compilers/swi-prolog/default.nix | 2 - pkgs/development/compilers/swift/default.nix | 16 +- .../compilers/swift/sourcekit-lsp/default.nix | 19 +- .../compilers/swift/swift-docc/default.nix | 15 +- pkgs/development/compilers/terra/default.nix | 4 - pkgs/development/embedded/blisp/default.nix | 3 +- .../embedded/fpga/ecpdap/default.nix | 4 +- .../embedded/fpga/fujprog/default.nix | 3 +- .../haskell-modules/configuration-darwin.nix | 80 +- .../haskell-modules/hackage-packages.nix | 60 +- .../interpreters/evcxr/default.nix | 4 - pkgs/development/interpreters/gauche/boot.nix | 21 +- .../interpreters/gauche/default.nix | 3 +- .../interpreters/gnudatalanguage/default.nix | 2 - .../development/interpreters/kerf/default.nix | 26 +- .../interpreters/octave/default.nix | 3 - .../interpreters/python/cpython/default.nix | 4 - .../interpreters/python/default.nix | 1 - .../interpreters/rakudo/moarvm.nix | 9 +- .../development/interpreters/ruby/default.nix | 3 - .../development/libraries/aribb25/default.nix | 5 +- .../libraries/audio/cubeb/default.nix | 16 +- .../libraries/audio/rtaudio/default.nix | 4 +- .../libraries/audio/rtmidi/default.nix | 12 +- .../libraries/audiofile/default.nix | 13 +- .../libraries/aws-c-cal/default.nix | 3 - .../libraries/aws-c-io/default.nix | 2 - .../libraries/aws-sdk-cpp/default.nix | 21 +- pkgs/development/libraries/botan/default.nix | 9 +- pkgs/development/libraries/box2d/default.nix | 33 +- pkgs/development/libraries/cairomm/1.16.nix | 13 +- .../development/libraries/cairomm/default.nix | 16 +- pkgs/development/libraries/cctz/default.nix | 3 - pkgs/development/libraries/check/default.nix | 3 - pkgs/development/libraries/cogl/default.nix | 13 +- .../libraries/ctranslate2/default.nix | 6 - .../libraries/discord-rpc/default.nix | 3 +- pkgs/development/libraries/enchant/2.x.nix | 4 - pkgs/development/libraries/fltk/common.nix | 16 +- .../libraries/fontconfig/default.nix | 3 +- pkgs/development/libraries/fox/fox-1.6.nix | 3 +- .../libraries/freenect/default.nix | 23 +- pkgs/development/libraries/gegl/default.nix | 4 - pkgs/development/libraries/getdns/default.nix | 14 +- pkgs/development/libraries/glew/1.10.nix | 18 +- pkgs/development/libraries/glew/default.nix | 3 +- pkgs/development/libraries/glibmm/2.68.nix | 5 - pkgs/development/libraries/glibmm/default.nix | 8 - pkgs/development/libraries/gnutls/default.nix | 6 +- .../libraries/gstreamer/good/default.nix | 6 +- pkgs/development/libraries/gtk/2.x.nix | 4 - pkgs/development/libraries/gtk/3.x.nix | 11 - .../libraries/harfbuzz/default.nix | 15 +- pkgs/development/libraries/hidapi/default.nix | 7 - pkgs/development/libraries/imgui/default.nix | 10 +- pkgs/development/libraries/irrlicht/mac.nix | 8 - pkgs/development/libraries/itk/generic.nix | 2 - .../libraries/kerberos/heimdal.nix | 9 - pkgs/development/libraries/kerberos/krb5.nix | 9 - .../libraries/libadwaita/default.nix | 15 +- pkgs/development/libraries/libao/default.nix | 8 - .../libraries/libbluray/default.nix | 6 +- .../development/libraries/libbtbb/default.nix | 3 +- .../libraries/libcanberra/default.nix | 8 - .../libraries/libcdio-paranoia/default.nix | 6 - .../libraries/libdc1394/default.nix | 6 +- .../libraries/libdevil/default.nix | 4 +- .../libraries/libdvdcss/default.nix | 3 - .../libraries/libfilezilla/default.nix | 2 - .../development/libraries/libfive/default.nix | 3 +- .../development/libraries/libftdi/default.nix | 4 - .../libraries/libgdiplus/default.nix | 3 +- .../development/libraries/libgit2/default.nix | 18 +- pkgs/development/libraries/libiio/default.nix | 8 +- .../libraries/libimobiledevice/default.nix | 23 +- .../libraries/libiodbc/default.nix | 3 +- .../libraries/liblastfm/default.nix | 3 +- .../libraries/liblqr-1/default.nix | 6 - .../libraries/libmikmod/default.nix | 6 +- .../libraries/libopenshot-audio/default.nix | 8 - .../libraries/libphonenumber/default.nix | 15 +- .../libraries/librasterlite2/default.nix | 3 +- pkgs/development/libraries/libre/default.nix | 13 +- .../development/libraries/librsvg/default.nix | 4 - .../libraries/libsndfile/default.nix | 24 +- .../libraries/libsoundio/default.nix | 4 +- .../libraries/libstatgrab/default.nix | 3 - pkgs/development/libraries/libui/default.nix | 5 +- .../libraries/libuiohook/default.nix | 43 +- .../development/libraries/libusb1/default.nix | 4 - pkgs/development/libraries/libvgm/default.nix | 6 - .../development/libraries/libvirt/default.nix | 4 - .../libraries/libvncserver/default.nix | 4 - .../libraries/mailcore2/default.nix | 4 - pkgs/development/libraries/mesa/darwin.nix | 2 - pkgs/development/libraries/mlt/default.nix | 4 - .../libraries/mongocxx/default.nix | 3 +- pkgs/development/libraries/mpich/default.nix | 4 +- pkgs/development/libraries/mygui/default.nix | 4 - .../development/libraries/nghttp3/default.nix | 4 - pkgs/development/libraries/nspr/default.nix | 3 - pkgs/development/libraries/ogre/default.nix | 5 - pkgs/development/libraries/ois/default.nix | 11 +- pkgs/development/libraries/okapi/default.nix | 4 - .../libraries/onnxruntime/default.nix | 2 - .../libraries/openal-soft/default.nix | 10 +- .../libraries/opencolorio/default.nix | 9 - .../development/libraries/opencsg/default.nix | 4 +- .../development/libraries/opendht/default.nix | 4 - .../libraries/openscenegraph/default.nix | 13 - pkgs/development/libraries/pango/default.nix | 19 +- .../libraries/pangolin/default.nix | 27 +- pkgs/development/libraries/pangomm/2.42.nix | 17 +- pkgs/development/libraries/pangomm/2.48.nix | 17 +- .../development/libraries/pangomm/default.nix | 17 +- .../libraries/pc-ble-driver/default.nix | 4 - pkgs/development/libraries/physfs/default.nix | 3 +- .../libraries/physics/applgrid/default.nix | 3 +- pkgs/development/libraries/plplot/default.nix | 2 - .../libraries/portmidi/default.nix | 19 +- .../libraries/qmltermwidget/default.nix | 3 +- .../libraries/qtkeychain/default.nix | 16 +- .../libraries/rnnoise-plugin/default.nix | 10 - .../science/biology/elastix/default.nix | 3 +- .../libraries/science/math/clblas/default.nix | 12 - pkgs/development/libraries/soci/default.nix | 18 +- .../libraries/sofia-sip/default.nix | 3 +- pkgs/development/libraries/soil/default.nix | 15 +- .../libraries/speech-tools/default.nix | 8 - pkgs/development/libraries/sqlite/tools.nix | 3 +- .../development/libraries/tachyon/default.nix | 6 +- .../development/libraries/unicorn/default.nix | 3 - pkgs/development/libraries/vmmlib/default.nix | 17 +- .../libraries/webrtc-audio-processing/0.3.nix | 5 - .../webrtc-audio-processing/default.nix | 9 - pkgs/development/libraries/wiiuse/default.nix | 4 - .../libraries/wildmidi/default.nix | 15 +- .../development/libraries/wolfssl/default.nix | 5 - .../libraries/yubico-pam/default.nix | 19 +- pkgs/development/lua-modules/nfd/default.nix | 4 - pkgs/development/node-packages/overrides.nix | 79 +- .../ocaml-modules/bjack/default.nix | 10 +- .../ocaml-modules/cairo2/default.nix | 3 +- .../ocaml-modules/ffmpeg/ffmpeg-av.nix | 11 +- .../ocaml-modules/ffmpeg/ffmpeg-avcodec.nix | 11 +- .../ocaml-modules/ffmpeg/ffmpeg-avdevice.nix | 23 +- .../ocaml-modules/ffmpeg/ffmpeg-avfilter.nix | 15 +- .../ocaml-modules/ffmpeg/ffmpeg-avutil.nix | 10 +- .../ffmpeg/ffmpeg-swresample.nix | 5 +- .../ocaml-modules/ffmpeg/ffmpeg-swscale.nix | 5 +- .../development/ocaml-modules/gsl/default.nix | 5 - .../ocaml-modules/gstreamer/default.nix | 10 +- .../ocaml-modules/labltk/default.nix | 3 +- .../ocaml-modules/lacaml/default.nix | 4 +- .../ocaml-modules/ocaml-libvirt/default.nix | 7 - .../ocaml-modules/tsdl/default.nix | 23 +- .../php-packages/datadog_trace/default.nix | 22 +- .../php-packages/mongodb/default.nix | 3 - .../php-packages/snuffleupagus/default.nix | 3 - .../python-modules/adblock/default.nix | 4 - .../python-modules/audiotools/default.nix | 30 +- .../python-modules/awscrt/default.nix | 7 - .../python-modules/chromadb/default.nix | 3 +- .../cmsis-pack-manager/default.nix | 4 +- .../python-modules/cryptography/default.nix | 2 - .../python-modules/css-inline/default.nix | 4 - .../python-modules/datafusion/default.nix | 4 - .../python-modules/datalad-gooey/default.nix | 4 +- .../python-modules/deltalake/default.nix | 3 - .../python-modules/etebase/default.nix | 3 +- .../python-modules/gssapi/default.nix | 3 - .../python-modules/hf-transfer/default.nix | 3 - .../python-modules/hidapi/default.nix | 12 +- .../johnnycanencrypt/default.nix | 2 - .../python-modules/ledgerwallet/default.nix | 4 +- .../python-modules/manimpango/default.nix | 4 +- .../python-modules/matplotlib/default.nix | 6 +- .../python-modules/miniaudio/default.nix | 8 - .../python-modules/nh3/default.nix | 2 - .../python-modules/openusd/default.nix | 3 +- .../python-modules/primp/default.nix | 2 - .../python-modules/psutil/default.nix | 7 - .../python-modules/pygame-ce/default.nix | 3 +- .../python-modules/pymunk/default.nix | 4 - .../python-modules/pynput/default.nix | 10 +- .../python-modules/pyopencl/default.nix | 7 +- .../python-modules/pysequoia/default.nix | 3 - .../python-modules/pystatgrab/default.nix | 4 +- .../python-modules/python-rtmidi/default.nix | 10 - .../python-modules/pythonocc-core/default.nix | 3 +- .../python-modules/qcs-sdk-python/default.nix | 3 - .../raylib-python-cffi/default.nix | 33 +- .../python-modules/rtmidi-python/default.nix | 11 +- .../python-modules/scs/default.nix | 14 +- .../python-modules/skia-pathops/default.nix | 7 - .../python-modules/skytemple-rust/default.nix | 2 - .../python-modules/tensorflow/default.nix | 7 - .../python-modules/uamqp/default.nix | 11 +- .../python-modules/uharfbuzz/default.nix | 4 - .../python-modules/uvloop/default.nix | 9 +- .../webrtc-noise-gain/default.nix | 5 +- .../python-modules/zenoh/default.nix | 4 - pkgs/development/r-modules/default.nix | 1 - .../development/r-modules/generic-builder.nix | 4 - .../ruby-modules/gem-config/default.nix | 5 - .../tcl-modules/by-name/tk/tkimg/package.nix | 17 +- .../tools/amazon-qldb-shell/default.nix | 3 - .../analysis/cargo-tarpaulin/default.nix | 2 - .../tools/analysis/dotenv-linter/default.nix | 4 - .../tools/analysis/flow/default.nix | 39 +- .../tools/build-managers/fac/default.nix | 3 - .../tools/build-managers/moon/default.nix | 9 +- .../tools/build-managers/xmake/default.nix | 3 - .../buildkite-test-collector-rust/default.nix | 6 - pkgs/development/tools/cotton/default.nix | 4 - .../tools/database/replibyte/default.nix | 10 +- .../database/surrealdb-migrations/default.nix | 4 - pkgs/development/tools/devpod/default.nix | 6 - .../tools/documentation/doxygen/default.nix | 4 +- pkgs/development/tools/dump_syms/default.nix | 15 +- .../development/tools/geckodriver/default.nix | 2 - pkgs/development/tools/git-ps-rs/default.nix | 4 +- pkgs/development/tools/glslviewer/default.nix | 3 +- pkgs/development/tools/gptcommit/default.nix | 9 +- .../tools/graphql-client/default.nix | 4 +- pkgs/development/tools/hors/default.nix | 4 - pkgs/development/tools/htmlq/default.nix | 4 - pkgs/development/tools/jless/default.nix | 6 +- pkgs/development/tools/kdash/default.nix | 4 +- pkgs/development/tools/kubie/default.nix | 4 - pkgs/development/tools/minizinc/ide.nix | 3 +- .../tools/misc/binutils/default.nix | 3 +- pkgs/development/tools/misc/dura/default.nix | 14 +- .../tools/misc/fswatch/default.nix | 3 +- .../tools/misc/linuxkit/default.nix | 6 - pkgs/development/tools/misc/premake/5.nix | 2 - .../tools/misc/pwninit/default.nix | 4 +- .../development/tools/misc/texlab/default.nix | 4 - pkgs/development/tools/misc/tokei/default.nix | 2 - pkgs/development/tools/ocaml/dune/3.nix | 5 - pkgs/development/tools/ocaml/opam/default.nix | 12 +- pkgs/development/tools/pactorio/default.nix | 4 +- pkgs/development/tools/parsing/antlr/4.nix | 2 +- pkgs/development/tools/remodel/default.nix | 12 +- pkgs/development/tools/rover/default.nix | 14 +- pkgs/development/tools/rtags/default.nix | 19 +- pkgs/development/tools/rubyfmt/default.nix | 4 - .../tools/rust/cargo-audit/default.nix | 16 +- .../tools/rust/cargo-bazel/default.nix | 4 - .../tools/rust/cargo-c/default.nix | 4 - .../tools/rust/cargo-clone/default.nix | 18 +- .../tools/rust/cargo-codspeed/default.nix | 18 +- .../tools/rust/cargo-crev/default.nix | 6 - .../tools/rust/cargo-cyclonedx/default.nix | 6 - .../tools/rust/cargo-edit/default.nix | 14 +- .../tools/rust/cargo-flamegraph/default.nix | 4 - .../tools/rust/cargo-fund/default.nix | 2 - .../tools/rust/cargo-hf2/default.nix | 4 +- .../tools/rust/cargo-ndk/default.nix | 8 - .../rust/cargo-pgrx/buildPgrxExtension.nix | 3 +- .../tools/rust/cargo-udeps/default.nix | 6 - .../tools/rust/cargo-watch/default.nix | 7 - .../tools/rust/cargo-whatfeatures/default.nix | 4 +- .../tools/rust/cbindgen/default.nix | 3 - .../tools/rust/duckscript/default.nix | 4 - .../tools/rust/humility/default.nix | 14 +- .../default.nix | 13 +- .../development/tools/rust/rustup/default.nix | 4 - .../tools/rust/sqlx-cli/default.nix | 6 - pkgs/development/tools/sentry-cli/default.nix | 11 +- pkgs/development/tools/simavr/default.nix | 3 +- pkgs/development/tools/spr/default.nix | 4 - pkgs/development/tools/viceroy/default.nix | 4 - pkgs/development/tools/wasmedge/default.nix | 19 +- pkgs/development/tools/wrangler_1/default.nix | 6 - pkgs/development/web/nodejs/nodejs.nix | 24 +- pkgs/games/anki/default.nix | 112 +- pkgs/games/blightmud/default.nix | 19 +- pkgs/games/bugdom/default.nix | 18 +- pkgs/games/crawl/default.nix | 16 +- pkgs/games/easyrpg-player/default.nix | 8 - pkgs/games/exult/default.nix | 20 +- pkgs/games/ferium/default.nix | 8 - pkgs/games/flare/default.nix | 3 +- pkgs/games/flare/engine.nix | 3 +- pkgs/games/mudlet/default.nix | 35 +- pkgs/games/openmw/default.nix | 39 +- pkgs/games/openspades/default.nix | 31 +- pkgs/games/quake2/yquake2/default.nix | 18 +- pkgs/games/quakespasm/default.nix | 41 +- pkgs/games/scummvm/default.nix | 12 - pkgs/games/super-tux-kart/default.nix | 8 - pkgs/games/teeworlds/default.nix | 4 - pkgs/games/wesnoth/default.nix | 45 +- pkgs/misc/cups/default.nix | 9 +- pkgs/misc/drivers/spacenavd/default.nix | 3 +- pkgs/misc/jackaudio/default.nix | 6 - .../darwin/defaultbrowser/default.nix | 3 - pkgs/os-specific/darwin/khd/default.nix | 7 - pkgs/os-specific/darwin/macfuse/default.nix | 2 - pkgs/os-specific/darwin/noah/default.nix | 2 - .../darwin/osx-cpu-temp/default.nix | 3 - pkgs/os-specific/darwin/pngpaste/default.nix | 7 - pkgs/os-specific/darwin/qes/default.nix | 3 - .../darwin/swift-corelibs/libdispatch.nix | 2 - pkgs/os-specific/darwin/trash/default.nix | 6 - pkgs/servers/clickhouse/default.nix | 9 +- pkgs/servers/code-server/default.nix | 8 - pkgs/servers/dns/doh-proxy-rust/default.nix | 2 - pkgs/servers/fedigroups/default.nix | 4 +- pkgs/servers/geospatial/martin/default.nix | 10 +- pkgs/servers/krill/default.nix | 3 +- .../prometheus/wireguard-exporter.nix | 2 - pkgs/servers/mpd/default.nix | 27 +- pkgs/servers/openvscode-server/default.nix | 6 - pkgs/servers/oxigraph/default.nix | 7 - pkgs/servers/piping-server-rust/default.nix | 8 - pkgs/servers/pleroma/default.nix | 16 +- pkgs/servers/polaris/default.nix | 6 - pkgs/servers/pulseaudio/default.nix | 10 - pkgs/servers/rtrtr/default.nix | 4 - pkgs/servers/search/lnx/default.nix | 8 - pkgs/servers/search/qdrant/default.nix | 18 +- pkgs/servers/search/quickwit/default.nix | 3 +- pkgs/servers/sip/freeswitch/default.nix | 36 +- pkgs/servers/sql/mariadb/default.nix | 6 - pkgs/servers/sql/mysql/8.0.x.nix | 2 - pkgs/servers/sql/percona-server/8_0.nix | 2 - pkgs/servers/sql/percona-server/8_4.nix | 2 - pkgs/servers/sql/percona-server/default.nix | 2 - pkgs/servers/teleport/generic.nix | 24 +- pkgs/servers/trezord/default.nix | 5 +- pkgs/servers/unpackerr/default.nix | 8 - pkgs/servers/web-apps/lemmy/server.nix | 4 - pkgs/servers/x11/quartz-wm/default.nix | 6 - pkgs/shells/nushell/default.nix | 6 - pkgs/shells/nushell/plugins/default.nix | 20 +- pkgs/shells/nushell/plugins/formats.nix | 6 - pkgs/shells/nushell/plugins/gstat.nix | 3 +- pkgs/shells/nushell/plugins/highlight.nix | 6 - pkgs/shells/nushell/plugins/net.nix | 8 - pkgs/shells/nushell/plugins/polars.nix | 9 +- pkgs/shells/nushell/plugins/query.nix | 15 +- pkgs/shells/nushell/plugins/skim.nix | 6 - pkgs/shells/nushell/plugins/units.nix | 6 - pkgs/tools/X11/xidlehook/default.nix | 3 +- pkgs/tools/admin/procs/default.nix | 4 - pkgs/tools/admin/trinsic-cli/default.nix | 4 - pkgs/tools/archivers/pax/default.nix | 5 +- pkgs/tools/archivers/unar/default.nix | 22 +- pkgs/tools/audio/kaldi/default.nix | 13 +- pkgs/tools/backup/bacula/default.nix | 6 - pkgs/tools/backup/dar/default.nix | 4 - pkgs/tools/backup/monolith/default.nix | 4 - pkgs/tools/backup/rdedup/default.nix | 4 +- pkgs/tools/cd-dvd/cdrdao/default.nix | 19 +- pkgs/tools/cd-dvd/cdrtools/default.nix | 17 +- .../ceph/old-python-packages/cryptography.nix | 1 - pkgs/tools/filesystems/ntfs-3g/default.nix | 2 - pkgs/tools/graphics/asymptote/default.nix | 11 +- pkgs/tools/graphics/dmtx-utils/default.nix | 3 +- pkgs/tools/graphics/gnuplot/default.nix | 4 +- pkgs/tools/graphics/graphviz/default.nix | 28 +- pkgs/tools/graphics/pfstools/default.nix | 19 +- pkgs/tools/graphics/vulkan-tools/default.nix | 4 - .../waifu2x-converter-cpp/default.nix | 2 - pkgs/tools/graphics/zbar/default.nix | 2 - pkgs/tools/misc/aoc-cli/default.nix | 4 +- pkgs/tools/misc/apkeep/default.nix | 14 +- pkgs/tools/misc/contacts/default.nix | 6 - pkgs/tools/misc/dijo/default.nix | 4 +- pkgs/tools/misc/diskus/default.nix | 4 - pkgs/tools/misc/envchain/default.nix | 2 - pkgs/tools/misc/fclones/default.nix | 4 - pkgs/tools/misc/fclones/gui.nix | 16 +- pkgs/tools/misc/ffsend/default.nix | 11 +- pkgs/tools/misc/flowgger/default.nix | 4 +- pkgs/tools/misc/fondu/default.nix | 3 - pkgs/tools/misc/freshfetch/default.nix | 14 - pkgs/tools/misc/fwup/default.nix | 21 +- pkgs/tools/misc/grex/default.nix | 4 - pkgs/tools/misc/hyperfine/default.nix | 3 - pkgs/tools/misc/iay/default.nix | 17 +- .../tools/misc/lighthouse-steamvr/default.nix | 4 +- pkgs/tools/misc/lorri/default.nix | 7 - pkgs/tools/misc/minicom/default.nix | 2 - pkgs/tools/misc/noti/default.nix | 4 - pkgs/tools/misc/octofetch/default.nix | 5 +- pkgs/tools/misc/owofetch/default.nix | 7 - pkgs/tools/misc/rust-motd/default.nix | 12 +- pkgs/tools/misc/screen/default.nix | 3 +- pkgs/tools/misc/shadowenv/default.nix | 4 - pkgs/tools/misc/sheldon/default.nix | 2 - pkgs/tools/misc/sshx/default.nix | 4 - pkgs/tools/misc/synth/default.nix | 8 - pkgs/tools/misc/tab-rs/default.nix | 3 - pkgs/tools/misc/timidity/default.nix | 2 - pkgs/tools/misc/tmux-sessionizer/default.nix | 3 +- pkgs/tools/misc/toastify/default.nix | 5 - pkgs/tools/misc/topgrade/default.nix | 9 - pkgs/tools/misc/tremor-rs/default.nix | 2 - pkgs/tools/misc/wagyu/default.nix | 4 - pkgs/tools/misc/watchexec/default.nix | 7 - pkgs/tools/networking/aria2/default.nix | 3 +- pkgs/tools/networking/bitmask-vpn/default.nix | 18 +- pkgs/tools/networking/bore-cli/default.nix | 6 - pkgs/tools/networking/bore/default.nix | 7 - pkgs/tools/networking/cocom/default.nix | 4 - pkgs/tools/networking/davix/default.nix | 2 - pkgs/tools/networking/dogdns/default.nix | 5 +- pkgs/tools/networking/drill/default.nix | 11 +- pkgs/tools/networking/fast-ssh/default.nix | 4 - pkgs/tools/networking/ifwifi/default.nix | 2 - pkgs/tools/networking/innernet/default.nix | 2 - pkgs/tools/networking/isync/default.nix | 3 +- pkgs/tools/networking/lldpd/default.nix | 3 +- pkgs/tools/networking/mozwire/default.nix | 8 - pkgs/tools/networking/ockam/default.nix | 16 +- pkgs/tools/networking/openconnect/common.nix | 2 - pkgs/tools/networking/openconnect/default.nix | 7 +- pkgs/tools/networking/s3rs/default.nix | 4 +- pkgs/tools/networking/suckit/default.nix | 4 +- pkgs/tools/networking/tcpreplay/default.nix | 9 +- pkgs/tools/networking/tunnelto/default.nix | 6 +- pkgs/tools/networking/veilid/default.nix | 8 - .../networking/wg-netmanager/default.nix | 4 - .../package-management/lix/common-lix.nix | 2 - pkgs/tools/package-management/lix/default.nix | 4 +- .../package-management/nix-du/default.nix | 4 +- .../package-management/nix-index/default.nix | 4 +- .../nix-template/default.nix | 3 +- .../nix/common-autoconf.nix | 9 - .../package-management/nix/common-meson.nix | 9 - pkgs/tools/package-management/nix/default.nix | 3 - .../nix/modular/src/libstore/package.nix | 2 - .../tools/package-management/nix/nix-perl.nix | 22 +- .../security/age-plugin-ledger/default.nix | 4 +- pkgs/tools/security/clamav/default.nix | 32 +- pkgs/tools/security/cosign/default.nix | 5 +- pkgs/tools/security/gpg-tui/default.nix | 4 - pkgs/tools/security/hashcat/default.nix | 8 - pkgs/tools/security/kbs2/default.nix | 10 +- pkgs/tools/security/keybase/default.nix | 20 - pkgs/tools/security/lethe/default.nix | 4 - pkgs/tools/security/libacr38u/default.nix | 3 +- pkgs/tools/security/pcsc-tools/default.nix | 2 - pkgs/tools/security/pcsclite/default.nix | 6 - pkgs/tools/security/proxmark3/default.nix | 8 +- pkgs/tools/security/quill/default.nix | 2 - pkgs/tools/security/rblake2sum/default.nix | 4 - pkgs/tools/security/rblake3sum/default.nix | 4 - pkgs/tools/security/rucredstash/default.nix | 4 - pkgs/tools/security/rustscan/default.nix | 4 - pkgs/tools/security/saml2aws/default.nix | 2 - pkgs/tools/security/softhsm/default.nix | 2 - pkgs/tools/security/solo2-cli/default.nix | 10 - pkgs/tools/security/vaultwarden/default.nix | 6 - pkgs/tools/system/clinfo/default.nix | 13 +- pkgs/tools/system/collectd/default.nix | 12 +- pkgs/tools/system/collectd/plugins.nix | 14 +- pkgs/tools/system/gotop/default.nix | 5 - pkgs/tools/system/htop/default.nix | 2 - pkgs/tools/system/netdata/default.nix | 13 +- pkgs/tools/system/pciutils/default.nix | 12 +- pkgs/tools/system/plan9port/default.nix | 10 - pkgs/tools/system/smartmontools/default.nix | 9 +- pkgs/tools/text/autocorrect/default.nix | 8 - pkgs/tools/text/chars/default.nix | 4 - pkgs/tools/text/coloursum/default.nix | 4 - pkgs/tools/text/diffr/default.nix | 4 - pkgs/tools/text/fastmod/default.nix | 2 - pkgs/tools/text/igrep/default.nix | 4 - pkgs/tools/text/languagetool-rust/default.nix | 3 +- pkgs/tools/text/mdbook-linkcheck/default.nix | 3 +- pkgs/tools/text/mdcat/default.nix | 15 +- pkgs/tools/text/pinyin-tool/default.nix | 4 - pkgs/tools/text/ripgrep-all/default.nix | 3 - pkgs/tools/typesetting/htmldoc/default.nix | 19 +- pkgs/tools/video/atomicparsley/default.nix | 3 +- pkgs/tools/video/yaydl/default.nix | 4 +- pkgs/top-level/all-packages.nix | 2060 ++++------------- pkgs/top-level/lua-packages.nix | 1 - pkgs/top-level/ocaml-packages.nix | 51 +- pkgs/top-level/perl-packages.nix | 19 +- pkgs/top-level/php-packages.nix | 9 +- pkgs/top-level/python-packages.nix | 89 +- pkgs/top-level/qt5-packages.nix | 14 +- pkgs/top-level/qt6-packages.nix | 6 +- 1173 files changed, 2734 insertions(+), 10513 deletions(-) diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index a7882ba25f57..dc3e55335cb8 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -377,14 +377,7 @@ let inputs = basePackages - ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - CoreServices - ] - ); + ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]; # define shell startup command hooks = '' diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 25898ef8bd27..7360ec62239c 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -2,7 +2,6 @@ fetchurl, lib, stdenv, - IOKit ? null, }: stdenv.mkDerivation rec { @@ -19,8 +18,6 @@ stdenv.mkDerivation rec { "INSTALL=install" ]; - buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; - meta = with lib; { homepage = "http://linukz.org/cd-discid.shtml"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 54fe24415840..aa640b573ddd 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -9,13 +9,6 @@ which, DarwinTools, xcbuild, - AppKit, - Carbon, - CoreAudio, - CoreMIDI, - CoreServices, - Kernel, - MultitouchSupport, }: stdenv.mkDerivation rec { @@ -38,18 +31,7 @@ stdenv.mkDerivation rec { xcbuild ]; - buildInputs = - [ libsndfile ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Carbon - CoreAudio - CoreMIDI - CoreServices - Kernel - MultitouchSupport - ]; + buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib; patches = [ ./darwin-limits.patch ]; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index d4fef58281d0..167330ef6c6d 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -6,9 +6,6 @@ ncurses, pkg-config, libiconv, - CoreAudio, - AudioUnit, - VideoToolbox, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib ? null, @@ -152,9 +149,6 @@ stdenv.mkDerivation rec { [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreAudio - AudioUnit - VideoToolbox ] ++ lib.flatten (lib.concatMap (a: a.deps) opts); diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 430bd1cb9fed..f4ae7383d4e6 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -9,10 +9,6 @@ bison, boost, gettext, - Accelerate, - AudioUnit, - CoreAudio, - CoreMIDI, portaudio, alsa-lib ? null, libpulseaudio ? null, @@ -61,10 +57,6 @@ stdenv.mkDerivation { boost ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - AudioUnit - CoreAudio - CoreMIDI portaudio ] ++ lib.optionals stdenv.hostPlatform.isLinux ( diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 14835a9e0b60..19b5dd800b5b 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -17,9 +17,6 @@ pcaudiolib, sonicSupport ? true, sonic, - CoreAudio, - AudioToolbox, - AudioUnit, alsa-plugins, makeWrapper, }: @@ -63,12 +60,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional mbrolaSupport mbrola ++ lib.optional pcaudiolibSupport pcaudiolib - ++ lib.optional sonicSupport sonic - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - AudioToolbox - AudioUnit - ]; + ++ lib.optional sonicSupport sonic; # touch ChangeLog to avoid below error on darwin: # Makefile.am: error: required file './ChangeLog.md' not found diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 90e3d80ad14d..17058192ecdb 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,10 +7,6 @@ alsa-lib, SDL2, libiconv, - CoreAudio, - CoreMIDI, - CoreServices, - Cocoa, }: stdenv.mkDerivation rec { @@ -30,10 +26,6 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreAudio - CoreMIDI - CoreServices - Cocoa ]; passthru.tests = { diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index e31dbbed38b2..0c6e804aeceb 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -16,7 +16,6 @@ libicns, yaml-cpp, makeWrapper, - Cocoa, includeDemo ? true, }: @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { alsa-lib udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index f7c33347e13e..63ac2e3b1040 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -7,9 +7,6 @@ openssl, libiconv, sqlite, - Security, - SystemConfiguration, - CoreFoundation, installShellFiles, asciidoctor, }: @@ -41,9 +38,6 @@ rustPlatform.buildRustPackage rec { if stdenv.hostPlatform.isDarwin then [ libiconv - Security - SystemConfiguration - CoreFoundation ] else [ diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index ef6d8402ce49..12e6940ccc87 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -5,7 +5,6 @@ SDL2, python3, jack2, - Foundation, alsa-lib, pkg-config, }: @@ -31,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib - ++ lib.optional stdenv.hostPlatform.isDarwin Foundation ++ lib.optional stdenv.hostPlatform.isLinux jack2; preBuild = '' diff --git a/pkgs/applications/audio/master_me/default.nix b/pkgs/applications/audio/master_me/default.nix index 3c766b701cf9..3f62b0f62d03 100644 --- a/pkgs/applications/audio/master_me/default.nix +++ b/pkgs/applications/audio/master_me/default.nix @@ -8,7 +8,6 @@ libXrandr, pkg-config, python3, - Cocoa, }: stdenv.mkDerivation rec { pname = "master_me"; @@ -28,7 +27,6 @@ stdenv.mkDerivation rec { libGL python3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXext diff --git a/pkgs/applications/audio/midivisualizer/default.nix b/pkgs/applications/audio/midivisualizer/default.nix index eb409930a3b2..911d9688d286 100644 --- a/pkgs/applications/audio/midivisualizer/default.nix +++ b/pkgs/applications/audio/midivisualizer/default.nix @@ -12,13 +12,6 @@ libXcursor, gtk3, ffmpeg-full, - AppKit, - Carbon, - Cocoa, - CoreAudio, - CoreMIDI, - CoreServices, - Kernel, }: stdenv.mkDerivation (finalAttrs: { @@ -49,15 +42,6 @@ stdenv.mkDerivation (finalAttrs: { libXinerama libXcursor gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Carbon - Cocoa - CoreAudio - CoreMIDI - CoreServices - Kernel ]; installPhase = diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix index 37f87257bdf3..0be81f52a4d5 100644 --- a/pkgs/applications/audio/minidsp/default.nix +++ b/pkgs/applications/audio/minidsp/default.nix @@ -4,8 +4,6 @@ rustPlatform, stdenv, libusb1, - AppKit, - IOKit, pkg-config, }: rustPlatform.buildRustPackage rec { @@ -24,12 +22,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - IOKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ]; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index c8ceef846e1f..24665b7ddc55 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -9,8 +9,6 @@ libX11, libXau, libXdmcp, - Carbon, - Cocoa, cppunit, }: @@ -61,10 +59,6 @@ stdenv.mkDerivation { libX11 libXau libXdmcp - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa ]; checkInputs = [ diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 581ace1d3c3c..08d71f5b1684 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -11,7 +11,6 @@ popt, libtool, libiconv, - CoreServices, # Sound sub-systems alsaSupport ? (!stdenv.hostPlatform.isDarwin), alsa-lib, @@ -125,7 +124,6 @@ stdenv.mkDerivation { ++ lib.optional samplerateSupport libsamplerate ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreServices ]; configureFlags = [ diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index d89c9c65838e..a919a0d98c4f 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -10,8 +10,6 @@ withPulse ? stdenv.hostPlatform.isLinux, libpulseaudio, withCoreAudio ? stdenv.hostPlatform.isDarwin, - AudioUnit, - AudioToolbox, withJack ? stdenv.hostPlatform.isUnix, jack, withConplay ? !stdenv.hostPlatform.isWindows, @@ -45,8 +43,6 @@ stdenv.mkDerivation rec { ++ lib.optionals withAlsa [ alsa-lib ] ++ lib.optionals withPulse [ libpulseaudio ] ++ lib.optionals withCoreAudio [ - AudioUnit - AudioToolbox ] ++ lib.optionals withJack [ jack ] ); diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index ac807528f509..029d728a7305 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -5,7 +5,6 @@ rustPlatform, pkg-config, wrapGAppsHook3, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { pkg-config wrapGAppsHook3 ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; preConfigure = '' substituteInPlace lib/utils.rs \ diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix index 7dee1402f30a..1d8c4e5ae0e6 100644 --- a/pkgs/applications/audio/parrot/default.nix +++ b/pkgs/applications/audio/parrot/default.nix @@ -9,9 +9,7 @@ unstableGitUpdater, openssl, pkg-config, - stdenv, yt-dlp, - Security, }: rustPlatform.buildRustPackage { pname = "parrot"; @@ -36,7 +34,7 @@ rustPlatform.buildRustPackage { buildInputs = [ libopus openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; postInstall = '' wrapProgram $out/bin/parrot \ diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 5d10db730f4f..738a85d9d2ac 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -9,7 +9,6 @@ SDL2, libX11, libXext, - Cocoa, utf8proc, nix-update-script, }: @@ -64,8 +63,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libXext - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index f6cbf58d8954..205f8cd80749 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -13,8 +13,6 @@ libvorbis, libopus, soxr, - IOKit, - AudioToolbox, aixlog, popl, pulseaudioSupport ? false, @@ -55,11 +53,7 @@ stdenv.mkDerivation rec { openssl ] ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - AudioToolbox - ]; + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index dace69315ac1..f0b88dea3bed 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -6,8 +6,6 @@ pkg-config, alsa-lib, libxmp, - AudioUnit, - CoreAudio, }: stdenv.mkDerivation rec { @@ -25,13 +23,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config ]; - buildInputs = - [ libxmp ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioUnit - CoreAudio - ]; + buildInputs = [ libxmp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; meta = with lib; { description = "Extended module player"; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index c644d6662775..d6a3a2d93618 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -7,9 +7,6 @@ makeWrapper, webkitgtk_4_0, zenity, - Cocoa, - Security, - WebKit, withGui ? true, }: @@ -31,13 +28,7 @@ rustPlatform.buildRustPackage rec { pkg-config makeWrapper ]; - buildInputs = - lib.optional stdenv.hostPlatform.isDarwin Security - ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0 - ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [ - Cocoa - WebKit - ]; + buildInputs = lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0; buildNoDefaultFeatures = true; buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui"; diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index d06ce837c0a3..01e1b624821b 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, rocksdb_7_10, - Security, }: let @@ -31,8 +29,6 @@ rustPlatform.buildRustPackage rec { ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 8361c2e23f94..c024b07db1ab 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -1,6 +1,5 @@ { cmake, - CoreFoundation, fetchFromGitHub, fetchurl, lib, @@ -11,10 +10,8 @@ protobuf, rustPlatform, rust-jemalloc-sys, - Security, sqlite, stdenv, - SystemConfiguration, testers, }: @@ -59,11 +56,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - SystemConfiguration ]; depositContractSpec = fetchurl { diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index e39d5374b9ad..0ad489b74309 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -16,10 +16,6 @@ unbound, zeromq, - # darwin - CoreData, - IOKit, - trezorSupport ? true, hidapi, libusb1, @@ -88,10 +84,6 @@ stdenv.mkDerivation rec { unbound zeromq ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - CoreData - ] ++ lib.optionals trezorSupport [ python3 hidapi diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix index e88ce594cd8d..2ae7023c515a 100644 --- a/pkgs/applications/blockchains/optimism/geth.nix +++ b/pkgs/applications/blockchains/optimism/geth.nix @@ -4,7 +4,6 @@ buildGoModule, fetchFromGitHub, libobjc, - IOKit, }: buildGoModule rec { @@ -39,7 +38,6 @@ buildGoModule rec { # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - IOKit ]; ldflags = [ diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 8d74bc87909f..1ae808ec2d50 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -10,8 +10,6 @@ rustPlatform, rustc, stdenv, - Security, - SystemConfiguration, }: let @@ -60,13 +58,9 @@ rustPlatform.buildRustPackage rec { ]; # NOTE: jemalloc is used by default on Linux with unprefixed enabled - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ]; checkInputs = [ cacert diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 219e9f530f4c..f1c0bc66f641 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, lib, rustPlatform, - Security, curl, pkg-config, openssl, @@ -41,7 +40,6 @@ rustPlatform.buildRustPackage rec { # ROCKSDB_LIB_DIR="${rocksdb}/lib"; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security curl ]; diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index 66d28bd3bac8..ad3cced89007 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, protobuf, rustfmt, - stdenv, - darwin, pkg-config, openssl, }: @@ -42,10 +40,6 @@ in rustfmt ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - passthru.updateScript = updateScript; __darwinAllowLocalNetworking = true; @@ -70,13 +64,9 @@ in rustfmt ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; passthru.updateScript = updateScript; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 1706bcd888d7..dd1375829534 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -15,7 +15,6 @@ makeWrapper, rustPlatform, pkg-config, - Security, stdenv, testers, tl-expected, @@ -55,19 +54,15 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { pkg-config ]; - buildInputs = - [ - boost - db62 - libevent - libsodium - tl-expected - utf8cpp - zeromq - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + boost + db62 + libevent + libsodium + tl-expected + utf8cpp + zeromq + ]; # Use the stdenv default phases (./configure; make) instead of the # ones from buildRustPackage. diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 90189ee8b779..cc604b222f32 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -6,21 +6,6 @@ lib.makeScope pkgs.newScope ( inherit (self) callPackage; inheritedArgs = { 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 { diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 2e058bb5349b..e3ef4bd8e9c1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -810,12 +810,6 @@ let osx-dictionary = if pkgs.stdenv.hostPlatform.isDarwin then super.osx-dictionary.overrideAttrs (old: { - buildInputs = - old.buildInputs - ++ (with pkgs.darwin.apple_sdk.frameworks; [ - CoreServices - Foundation - ]); postBuild = (old.postBuild or "") + '' diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index b8156c5b3bcc..4b2a017ff595 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -114,21 +114,6 @@ "lucid" ), - # macOS dependencies for NS and macPort - Accelerate, - AppKit, - Carbon, - Cocoa, - GSS, - IOKit, - ImageCaptureCore, - ImageIO, - OSAKit, - Quartz, - QuartzCore, - UniformTypeIdentifiers, - WebKit, - # test callPackage, }: @@ -372,27 +357,6 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals withNS [ 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 diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 14efdb52adcc..ce7e93fba84f 100644 --- a/pkgs/applications/editors/libresprite/default.nix +++ b/pkgs/applications/editors/libresprite/default.nix @@ -22,9 +22,6 @@ SDL2, SDL2_image, lua, - AppKit, - Cocoa, - Foundation, nixosTests, }: @@ -48,29 +45,23 @@ stdenv.mkDerivation (finalAttrs: { gtest ]; - buildInputs = - [ - curl - freetype - giflib - libjpeg - libpng - libwebp - libarchive - libX11 - pixman - tinyxml-2 - zlib - SDL2 - SDL2_image - lua - # no v8 due to missing libplatform and libbase - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - Foundation - ]; + buildInputs = [ + curl + freetype + giflib + libjpeg + libpng + libwebp + libarchive + libX11 + pixman + tinyxml-2 + zlib + SDL2 + SDL2_image + lua + # no v8 due to missing libplatform and libbase + ]; cmakeFlags = [ "-DWITH_DESKTOP_INTEGRATION=ON" diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 8d6d1ac8bc04..44c478e7209e 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub, - Foundation, freetype, lib, lua5_4, @@ -29,16 +28,12 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - freetype - lua5_4 - pcre2 - SDL2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; + buildInputs = [ + freetype + lua5_4 + pcre2 + SDL2 + ]; mesonFlags = [ "-Duse_system_lua=true" diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 837e0b9085a0..ec267de59e44 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -14,9 +14,6 @@ url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/68f6d131750aa778807119e03eed70286a17b1cb/trunk/archlinux.vim"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; }, - # apple frameworks - Carbon, - Cocoa, }: let @@ -41,16 +38,11 @@ stdenv.mkDerivation { gettext pkg-config ]; - buildInputs = - [ - ncurses - bash - gawk - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - ]; + buildInputs = [ + ncurses + bash + gawk + ]; strictDeps = true; diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 34aa8e84721a..6c95edc8c795 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -30,11 +30,6 @@ makeWrapper, wrapGAppsHook3, - # apple frameworks - CoreServices, - CoreData, - Cocoa, - Foundation, libobjc, 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 == "gtk3") gtk3-x11 ++ lib.optionals darwinSupport [ - CoreServices - CoreData - Cocoa - Foundation libobjc ] ++ lib.optional luaSupport lua diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 5abec4f2f08c..0c42097b509c 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -10,8 +10,6 @@ esbuild, pkg-config, libsecret, - stdenv, - darwin, setDefaultServerPath ? true, }: @@ -39,18 +37,13 @@ let buildInputs = [ pkgsBuildBuild.libsecret ]; - nativeBuildInputs = - [ - jq - moreutils - esbuild - # Required by `keytar`, which is a dependency of `vsce`. - pkg-config - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + nativeBuildInputs = [ + jq + moreutils + esbuild + # Required by `keytar`, which is a dependency of `vsce`. + pkg-config + ]; # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 installPhase = '' diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index 43c63bb95260..7dfdb60011f7 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -26,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; # disable downloading and building the tree-sitter grammars at build time # grammars can be configured in a config file and installed with `zee --build` diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index b60e9ddd38ad..fc6e25d3ab38 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -3,10 +3,7 @@ stdenv, fetchFromGitHub, alsa-lib, - AudioUnit, autoreconfHook, - Carbon, - Cocoa, ffmpeg, fluidsynth, freetype, @@ -86,11 +83,6 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib libxkbfile 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 diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index f27d3e06adb5..90ec74cd0485 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -11,7 +11,6 @@ graphicsmagick, libGL, libGLU, - OpenGL, libpng, makeDesktopItem, }: @@ -46,17 +45,10 @@ stdenv.mkDerivation rec { SDL_sound libpng ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ - OpenGL - ] - else - [ - libGL - libGLU - ] - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGL + libGLU + ]; # 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"; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 232346606411..ef6854e558f4 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -32,12 +32,8 @@ which, writeScript, zlib, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; -in stdenv.mkDerivation rec { pname = "mame"; version = "0.276"; @@ -105,8 +101,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libpcap - CoreAudioKit - ForceFeedback ]; nativeBuildInputs = [ diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 24be5ebeb558..ca3d0dad486c 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, cmake, rustPlatform, pkg-config, @@ -9,7 +8,6 @@ gtk3, glib, openssl, - Security, nix-update-script, }: @@ -32,7 +30,7 @@ rustPlatform.buildRustPackage rec { glib gtk3 openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 3dd69d56b19d..f1ec2668577b 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -45,8 +45,6 @@ libde265Support ? true, libde265, fftw, - ApplicationServices, - Foundation, testers, }: @@ -124,11 +122,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional djvulibreSupport djvulibre ++ lib.optional openexrSupport openexr ++ lib.optional librsvgSupport librsvg - ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + ++ lib.optional openjpegSupport openjpeg; propagatedBuildInputs = [ fftw ] diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c04bada3d3ed..8f5b155b6534 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -52,8 +52,6 @@ potrace, coreutils, curl, - ApplicationServices, - Foundation, testers, nixos-icons, perlPackages, @@ -147,11 +145,7 @@ stdenv.mkDerivation (finalAttrs: { librsvg pango ] - ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + ++ lib.optional openjpegSupport openjpeg; propagatedBuildInputs = [ curl ] diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 52aeb7cfb995..ceb1f60c8a6c 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, itk, - Cocoa, }: stdenv.mkDerivation { @@ -19,7 +18,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + buildInputs = [ itk ]; cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index e207d3c68373..2b78ac0d9ca8 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -12,7 +12,6 @@ qttools, xorg, libtiff, - darwin, }: mkDerivation rec { @@ -42,7 +41,7 @@ mkDerivation rec { qtbase xorg.libXt libtiff - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AGL; + ]; preConfigure = '' NOCONFIGURE=1 ./autogen.sh diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index 89014afb8eb4..c6fe5dc4fc7f 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -16,11 +16,6 @@ libxcb, libxkbcommon, wayland, - AppKit, - CoreGraphics, - CoreServices, - Foundation, - OpenGL, }: let rpathLibs = @@ -59,15 +54,7 @@ rustPlatform.buildRustPackage rec { python3 ]; - buildInputs = - rpathLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - CoreServices - Foundation - OpenGL - ]; + buildInputs = rpathLibs; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index 91731416199b..14bfac54b081 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -9,7 +9,6 @@ freetype, libGL, xorg, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -31,19 +30,15 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - expat - fontconfig - freetype - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + expat + fontconfig + freetype + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + ]; postInstall = '' install -Dm444 assets/epick.desktop -t $out/share/applications diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 2117a65a821b..7ffd861b9508 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -11,8 +11,6 @@ # See https://github.com/NixOS/nixpkgs/pull/324022. This may change later. vtk_9, autoPatchelfHook, - Cocoa, - OpenGL, python3Packages, opencascade-occt, assimp, @@ -64,10 +62,6 @@ stdenv.mkDerivation rec { assimp fontconfig ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - OpenGL - ] ++ lib.optionals withPythonBinding [ python3Packages.python # Using C++ header files, not Python import diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index f25c1064a7ac..fd541500c049 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -17,12 +17,6 @@ libGLU, alsa-lib, fontconfig, - AVFoundation, - Carbon, - Cocoa, - CoreAudio, - Kernel, - OpenGL, }: stdenv.mkDerivation rec { @@ -75,14 +69,6 @@ stdenv.mkDerivation rec { alsa-lib fontconfig libGLU - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AVFoundation - Carbon - Cocoa - CoreAudio - Kernel - OpenGL ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix index 1d64cc10806f..d91dd67a1913 100644 --- a/pkgs/applications/graphics/gimp/2.0/default.nix +++ b/pkgs/applications/graphics/gimp/2.0/default.nix @@ -47,8 +47,6 @@ libgudev, openexr, desktopToDarwinBundle, - AppKit, - Cocoa, gtk-mac-integration-gtk2, withPython ? false, python2, @@ -144,8 +142,6 @@ stdenv.mkDerivation (finalAttrs: { mypaint-brushes1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa gtk-mac-integration-gtk2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 0b2406c89f8b..639719d8d32d 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -66,8 +66,6 @@ adwaita-icon-theme, alsa-lib, desktopToDarwinBundle, - AppKit, - Cocoa, }: let @@ -202,8 +200,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp - AppKit - Cocoa ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libgudev diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 6e5641cafd2a..be7ca56b14f7 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -17,7 +17,6 @@ gtk4, gdk-pixbuf, libadwaita, - Foundation, nix-update-script, }: @@ -60,16 +59,12 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils ]; - buildInputs = - [ - glib - gtk4 - gdk-pixbuf - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; + buildInputs = [ + glib + gtk4 + gdk-pixbuf + libadwaita + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index a0e757cc536f..34f657bf71e9 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -8,7 +8,6 @@ withSixel ? false, libsixel, xorg, - AppKit, withSki ? true, }: @@ -36,8 +35,7 @@ rustPlatform.buildRustPackage rec { libX11 libXrandr ] - ) - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; + ); buildNoDefaultFeatures = !withSki; buildFeatures = lib.optional withSixel "sixel"; diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 209dc697817b..19c02eeec154 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -18,7 +18,6 @@ qtbase, qtsvg, qttools, - VideoDecodeAcceleration, wrapQtAppsHook, copyDesktopItems, # needed to run natively on wayland @@ -44,26 +43,22 @@ stdenv.mkDerivation rec { copyDesktopItems ]; - buildInputs = - [ - boost - bzip2 - ffmpeg - fftwSinglePrec - hdf5 - muparser - netcdf - openssl - python3 - qscintilla - qtbase - qtsvg - qttools - qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - VideoDecodeAcceleration - ]; + buildInputs = [ + boost + bzip2 + ffmpeg + fftwSinglePrec + hdf5 + muparser + netcdf + openssl + python3 + qscintilla + qtbase + qtsvg + qttools + qtwayland + ]; # manually create a desktop file desktopItems = [ diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 16b15a555172..fe173e376ba5 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,17 +1,12 @@ { callPackage, lowPrio, - Accelerate, - CoreGraphics, - CoreVideo, }: let base3 = callPackage ./tesseract3.nix { }; base4 = callPackage ./tesseract4.nix { }; - base5 = callPackage ./tesseract5.nix { - inherit Accelerate CoreGraphics CoreVideo; - }; + base5 = callPackage ./tesseract5.nix { }; languages = callPackage ./languages.nix { }; in { diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index 22059873e4bb..4c1442b42b96 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -12,9 +12,6 @@ libtiff, icu, pango, - Accelerate, - CoreGraphics, - CoreVideo, }: stdenv.mkDerivation rec { @@ -35,21 +32,15 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = - [ - curl - leptonica - libarchive - libpng - libtiff - icu - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreVideo - ]; + buildInputs = [ + curl + leptonica + libarchive + libpng + libtiff + icu + pango + ]; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 4457c9b88c79..95efcf68abda 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -27,9 +27,7 @@ SDL2, SDL2_mixer, wayland-protocols, - Carbon, CoreServices, - OpenCL, callPackage, nixosTests, @@ -73,11 +71,6 @@ stdenv.mkDerivation (finalAttrs: { SDL2_mixer ] ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreServices - OpenCL - ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers; cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 3aa61ec06d30..e31bdb555634 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -19,10 +19,6 @@ autoconf, libtool, typescript, - ApplicationServices, - Carbon, - Cocoa, - VideoToolbox, }: rustPlatform.buildRustPackage rec { @@ -41,12 +37,6 @@ rustPlatform.buildRustPackage rec { ffmpeg x264 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Carbon - Cocoa - VideoToolbox - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus libva diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 6d6b3b7a1887..1a7f6081b301 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -6,7 +6,6 @@ autoreconfHook, autoconf-archive, pkg-config, - CoreAudio, enableAlsa ? true, alsa-lib, enableLibao ? true, @@ -84,8 +83,7 @@ stdenv.mkDerivation { amrnb amrwb ] - ++ lib.optional enableLibpulseaudio libpulseaudio - ++ lib.optional stdenv.hostPlatform.isDarwin CoreAudio; + ++ lib.optional enableLibpulseaudio libpulseaudio; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix index e2afd9d91b14..8c35e3ff33c2 100644 --- a/pkgs/applications/misc/binocle/default.nix +++ b/pkgs/applications/misc/binocle/default.nix @@ -4,13 +4,6 @@ rustPlatform, fetchFromGitHub, makeWrapper, - AppKit, - CoreFoundation, - CoreGraphics, - CoreVideo, - Foundation, - Metal, - QuartzCore, xorg, vulkan-loader, }: @@ -33,16 +26,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreFoundation - CoreGraphics - CoreVideo - Foundation - Metal - QuartzCore - ]; - postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/binocle \ --suffix LD_LIBRARY_PATH : ${ diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 4302d6cde399..0adaf746640f 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -8,7 +8,6 @@ cairo, poppler, wxGTK, - Cocoa, }: stdenv.mkDerivation rec { @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { cairo poppler wxGTK - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index d43afca3250c..094497db1697 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -5,8 +5,6 @@ pkg-config, libgit2, openssl, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -25,14 +23,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + libgit2 + openssl + ]; useNextest = true; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index e9de83749987..501f360f0493 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -17,12 +17,6 @@ gnutar, p7zip, xz, - IOKit, - Carbon, - Cocoa, - AudioToolbox, - OpenGL, - System, withTTYX ? true, libX11, withGUI ? true, @@ -94,15 +88,7 @@ stdenv.mkDerivation rec { debugpy pcpp ] - ) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Carbon - Cocoa - AudioToolbox - OpenGL - System - ]; + ); postPatch = '' patchShebangs python/src/prebuild.sh diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index d99d9cf44b31..950983d5c9df 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -10,7 +10,6 @@ libSM, libICE, which, - IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook3, @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { libX11 libSM libICE - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index a05800414a79..a9b41c42c5c3 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -4,9 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - CoreServices, - Security, }: rustPlatform.buildRustPackage rec { @@ -25,14 +22,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Knowledge management meta-framework for geeks"; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index f7f302628b8c..98dbc260bc31 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -11,7 +11,6 @@ wayland, libGL, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -36,20 +35,16 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - fontconfig - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libxcb - wayland - libxkbcommon - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.AppKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + fontconfig + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb + wayland + libxkbcommon + openssl + ]; checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # time out on darwin diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index 609414f21d7f..0e863c58be61 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -6,8 +6,6 @@ pkg-config, openssl, libgit2, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -30,8 +28,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libgit2 - Security - SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index ce1897b4aed2..12994582e9d4 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - meta = with lib; { description = "Plain text Zettelkasten based on mdBook"; homepage = "https://github.com/mdzk-rs/mdzk/"; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 2837666d49b1..f2d0f5e8880e 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - AppKit, DarwinTools, alsa-utils, at-spi2-core, @@ -86,9 +85,6 @@ stdenv.mkDerivation (finalAttrs: { flac gitMinimal ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - AppKit - ] ++ [ glew jasper diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 3265a1b61299..01f2f3623b3a 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - meta = with lib; { description = "Command-line tool to generate, analyze, convert and manipulate colors"; homepage = "https://github.com/sharkdp/pastel"; diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index a5049d253d73..c34dd208893c 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - Foundation, }: rustPlatform.buildRustPackage { @@ -19,7 +18,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; meta = with lib; { description = "Simple CLI pomodoro timer using desktop notifications written in Rust"; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index da47982cf58b..42f343cb7d01 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -11,7 +11,6 @@ cereal, cgal, curl, - darwin, dbus, eigen, expat, @@ -142,9 +141,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withSystemd [ systemd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreWLAN ]; strictDeps = true; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 8a3717a8eefc..6412b1e21a8f 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchFromGitHub, - Libsystem, - SystemConfiguration, installShellFiles, libiconv, rustPlatform, @@ -32,8 +30,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Libsystem - SystemConfiguration libiconv ]; diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 435da18f8abe..e9017cf243a4 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; # package does not contain tests as of v0.3.3 docCheck = false; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 31e866d0e7c5..09be6f40f853 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -19,7 +19,6 @@ pyxdg, withQuartz ? stdenv.hostPlatform.isDarwin, - ApplicationServices, withRandr ? stdenv.hostPlatform.isLinux, libxcb, withDrm ? stdenv.hostPlatform.isLinux, @@ -29,9 +28,6 @@ withGeolocation ? true, withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin, - CoreLocation, - Foundation, - Cocoa, withGeoclue ? withGeolocation && stdenv.hostPlatform.isLinux, geoclue, withAppIndicator ? stdenv.hostPlatform.isLinux, @@ -99,12 +95,6 @@ let ++ lib.optional withGeoclue geoclue ++ lib.optional withDrm libdrm ++ lib.optional withVidmode libXxf86vm - ++ lib.optional withQuartz ApplicationServices - ++ lib.optionals withCoreLocation [ - CoreLocation - Foundation - Cocoa - ] ++ lib.optional withAppIndicator ( if (pname != "gammastep") then libappindicator else libayatana-appindicator ); diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 24e160ab3a62..7051c11cc9eb 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, openssl, pkg-config, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; meta = with lib; { description = "Impossibly fast web search, made for static sites"; diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 6fa567357324..5386625f10f0 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchurl, - Carbon, - Cocoa, ffmpeg, glib, libGLU, @@ -43,10 +41,6 @@ stdenv.mkDerivation rec { gdal wxGTK32 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # TODO: libGLU doesn't build for macOS because of Mesa issues # (#233265); is it required for anything? diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index df841710a11c..a8c77f1d821b 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -27,13 +27,6 @@ xinput, avahi-compat, - # MacOS / darwin - ApplicationServices, - Carbon, - Cocoa, - CoreServices, - ScreenSaver, - UserNotifications, }: stdenv.mkDerivation rec { @@ -74,14 +67,6 @@ stdenv.mkDerivation rec { openssl pcre ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Carbon - Cocoa - CoreServices - ScreenSaver - UserNotifications - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index 76013b492330..4e3e7e441369 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -8,7 +8,6 @@ openssl, sqlite, libiconv, - Security, }: rustPlatform.buildRustPackage rec { @@ -35,7 +34,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 0772cd2d01a2..95c92c7c8e18 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -4,7 +4,6 @@ fetchurl, tcl, tk, - Cocoa, makeWrapper, }: @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcl tk - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 8b5e672d690f..32ae8dfc7d8c 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchFromSourcehut, pkg-config, ncurses, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -28,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; meta = with lib; { description = "Gemini Project client written in Rust with NCurses"; diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 482a692d164a..68fdce4c3cc7 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -14,7 +14,6 @@ opusfile, SDL2, the-foundation, - AppKit, zip, enableTUI ? false, ncurses, @@ -53,8 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableTUI [ ncurses sealcurses - ] - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; + ]; cmakeFlags = [ (lib.cmakeBool "ENABLE_TUI" enableTUI) diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 6866703b4454..bdf200e92865 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - Security ? null, versionCheckHook, }: @@ -21,8 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-6sRpsXydzKB0ZaV1HeagINgb6ol9dj3XT0+pd53QOCw="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index a9638bd40ffe..74788f7c5224 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -7,7 +7,6 @@ pkg-config, which, libvirt, - vmnet, withQemu ? false, qemu, makeWrapper, @@ -49,13 +48,7 @@ buildGoModule rec { makeWrapper ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ vmnet ] - else if stdenv.hostPlatform.isLinux then - [ libvirt ] - else - null; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libvirt ]; buildPhase = '' make COMMIT=${src.rev} diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix index acb9a3cd87e7..ef4915dc524f 100644 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchCrate, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-A7kD46gfXWK/OlFVMULlMa7Z9Q1it9/rhGo6pjFa38k="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - doCheck = false; meta = with lib; { diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 71ac15ef0cac..82906428ea9a 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,8 +18,6 @@ wxGTK32, gtk3, xdg-utils, - CoreServices, - Security, }: stdenv.mkDerivation { @@ -43,26 +41,21 @@ stdenv.mkDerivation { wrapGAppsHook3 ]; - buildInputs = - [ - boost - dbus - gettext - gnutls - libfilezilla - libidn - nettle - pugixml - sqlite - tinyxml - wxGTK32 - gtk3 - xdg-utils - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; + buildInputs = [ + boost + dbus + gettext + gnutls + libfilezilla + libidn + nettle + pugixml + sqlite + tinyxml + wxGTK32 + gtk3 + xdg-utils + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix index e5c90097e765..a198f7c0443b 100644 --- a/pkgs/applications/networking/gopher/phetch/default.nix +++ b/pkgs/applications/networking/gopher/phetch/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, scdoc, - Security, which, }: @@ -36,7 +34,7 @@ rustPlatform.buildRustPackage rec { scdoc which ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; postInstall = '' make manual diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 7e7438e873ee..94a04fc5bcd6 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -1,13 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -28,15 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Twitch chat in the terminal"; diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 30023e00057d..3003e119d279 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - Foundation, dbusSupport ? stdenv.hostPlatform.isLinux, dbus, # rustls will be used for TLS if useOpenSSL=false @@ -28,10 +27,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM="; nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; - buildInputs = - lib.optionals dbusSupport [ dbus ] - ++ lib.optionals useOpenSSL [ openssl ] - ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; + buildInputs = lib.optionals dbusSupport [ dbus ] ++ lib.optionals useOpenSSL [ openssl ]; buildFeatures = lib.optional notificationSupport "desktop-notifications"; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 42f6c8597701..26aeb6f93388 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -9,7 +9,6 @@ gpgSupport ? true, sslSupport ? true, fetchpatch, - Foundation, }: assert gpgSupport -> gpgme != null; @@ -42,10 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = - [ gtk2 ] - ++ lib.optionals gpgSupport [ gpgme ] - ++ lib.optionals sslSupport [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + [ gtk2 ] ++ lib.optionals gpgSupport [ gpgme ] ++ lib.optionals sslSupport [ openssl ]; configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl"; diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index aade921aa809..436ac744cb4b 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -1,10 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -21,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - CARGO_CRATE_NAME = "mhost"; doCheck = false; diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 7cd4d9349997..1fea4be45eba 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -7,7 +7,6 @@ gsasl, libidn, pkg-config, - Security, nlsSupport ? true, idnSupport ? true, gsaslSupport ? true, @@ -33,8 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - lib.optional stdenv.hostPlatform.isDarwin Security - ++ lib.optional gsaslSupport gsasl + lib.optional gsaslSupport gsasl ++ lib.optional idnSupport libidn ++ lib.optional (sslLibrary == "gnutls") gnutls ++ lib.optional (sslLibrary == "openssl") openssl; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 96934461c2e7..60946106d0dd 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -15,7 +15,6 @@ netcat-gnu, texinfo, which, - Security, withKeyring ? true, libsecret, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, @@ -56,14 +55,11 @@ let "--with-libgsasl" ] ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ]; - buildInputs = - [ - gnutls - gsasl - libidn2 - ] - ++ optionals stdenv.hostPlatform.isDarwin [ Security ] - ++ optionals withKeyring [ libsecret ]; + buildInputs = [ + gnutls + gsasl + libidn2 + ] ++ optionals withKeyring [ libsecret ]; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix index a37177426b10..bda3f618763f 100644 --- a/pkgs/applications/networking/mujmap/default.nix +++ b/pkgs/applications/networking/mujmap/default.nix @@ -3,8 +3,6 @@ fetchFromGitHub, rustPlatform, notmuch, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ notmuch - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; meta = with lib; { description = "JMAP integration for notmuch mail"; diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 798d4b906b44..e99d00a8064e 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -1,12 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - CoreServices, - Security, }: rustPlatform.buildRustPackage { @@ -24,12 +21,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "--all" ]; diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 45dcb717f2b8..30614b8b7f1f 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -23,7 +23,6 @@ dht, libnatpmp, libiconv, - Foundation, # Build options enableGTK3 ? false, gtkmm3, diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 240979abe9d2..5d0e9484c838 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -7,9 +7,6 @@ libsamplerate, swig, alsa-lib, - AppKit, - CoreFoundation, - Security, python3, pythonSupport ? true, runCommand, @@ -45,17 +42,10 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.wheel ]; - buildInputs = - [ - openssl - libsamplerate - ] - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreFoundation - Security - ]; + buildInputs = [ + openssl + libsamplerate + ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; env = lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index fd3e768c71d9..fa3d0fc67f68 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -7,7 +7,6 @@ pkg-config, gtk3, ncurses, - darwin, copyDesktopItems, makeDesktopItem, }: @@ -30,12 +29,10 @@ stdenv.mkDerivation rec { pkg-config copyDesktopItems ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isUnix [ - gtk3 - ncurses - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; + buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ + gtk3 + ncurses + ]; enableParallelBuilding = true; desktopItems = [ diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index c25585d74701..c45c6a659d4a 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -1,13 +1,10 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, pkg-config, libGL, xorg, - Carbon, - Cocoa, }: buildGoModule rec { @@ -27,23 +24,16 @@ buildGoModule rec { pkg-config ]; - buildInputs = - with xorg; - [ - libGL - libX11 - libXcursor - libXext - libXi - libXinerama - libXrandr - libXxf86vm - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - IOKit - ]; + buildInputs = with xorg; [ + libGL + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + libXxf86vm + ]; postInstall = '' for res in $(ls internal/assets/icons | sed -e 's/icon-//g' -e 's/.png//g'); do diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d613cc647432..af11de02aad6 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitLab, - ApplicationServices, asciidoctor, bcg729, bison, @@ -43,7 +42,6 @@ snappy, spandsp3, speexdsp, - SystemConfiguration, wrapGAppsHook3, zlib-ng, zstd, @@ -148,9 +146,7 @@ stdenv.mkDerivation rec { sbc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices gmp - SystemConfiguration ]; strictDeps = true; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index c724658db2aa..671254fdad4b 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -12,7 +12,6 @@ gtk2, glib, libXtst, - Cocoa, }: let @@ -62,13 +61,11 @@ stdenv.mkDerivation rec { makeWrapper stripJavaArchivesHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - gtk2 - glib - libXtst - ] - ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + gtk2 + glib + libXtst + ]; dontWrapGApps = true; diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index a6608f926967..ab7e8d6ac8aa 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -14,8 +14,6 @@ soapysdr-with-plugins, wxGTK32, enableDigitalLab ? false, - Cocoa, - WebKit, }: stdenv.mkDerivation rec { @@ -54,10 +52,6 @@ stdenv.mkDerivation rec { libpulseaudio libGL libX11 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - WebKit ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 2679132bdb8f..40929d11910d 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -11,7 +11,6 @@ libX11, gnuplot, fltk, - GLUT, withGui ? false, }: @@ -40,9 +39,6 @@ stdenv.mkDerivation rec { libusb1 soapysdr ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - GLUT - ] ++ lib.optionals withGui [ fltk libX11 diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 309ca8bf0f6a..d560f537b499 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { hamlib qtkeychain ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups - ]); + ]; nativeBuildInputs = [ wrapQtAppsHook diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index 6e140c25bffd..8e486eee2594 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -10,7 +10,6 @@ fftwFloat, volk, zstd, - AppKit, # Sources airspy_source ? true, airspy, @@ -107,7 +106,6 @@ stdenv.mkDerivation rec { volk zstd ] - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit ++ lib.optional stdenv.hostPlatform.isLinux libX11 ++ lib.optional airspy_source airspy ++ lib.optional airspyhf_source airspyhf diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 975a7dc1c261..4e4290f13d32 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -6,8 +6,6 @@ airspy, soapysdr, libobjc, - IOKit, - Security, }: stdenv.mkDerivation rec { @@ -29,8 +27,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - IOKit - Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix index 003561495c1b..ce2be6ec8a68 100644 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -11,8 +11,6 @@ libjack2, libusb1, soapysdr, - Accelerate, - CoreAudio, }: stdenv.mkDerivation rec { @@ -41,10 +39,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreAudio ]; cmakeFlags = [ diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 31747781cbda..0ce1e30c49de 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -7,8 +7,6 @@ libbladeRF, soapysdr, libobjc, - IOKit, - Security, }: let @@ -37,8 +35,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - IOKit - Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 949e5b5bff9d..59b328449f9f 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -7,8 +7,6 @@ hackrf, soapysdr, libobjc, - IOKit, - Security, }: let @@ -37,8 +35,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - IOKit - Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 16dd80a12cbc..ae2039a1ca4f 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -7,8 +7,6 @@ rtl-sdr, soapysdr, libobjc, - IOKit, - Security, }: stdenv.mkDerivation (finalAttrs: { @@ -33,8 +31,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - IOKit - Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 062a5c17bf03..40cf504d5f9c 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -8,8 +8,6 @@ boost, soapysdr, libobjc, - IOKit, - Security, }: stdenv.mkDerivation rec { @@ -35,8 +33,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - IOKit - Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 1f7966a64271..f2595124a1ad 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -6,7 +6,6 @@ makeBinaryWrapper, itk, vtk, - Cocoa, }: stdenv.mkDerivation (finalAttrs: { @@ -25,14 +24,10 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper ]; - buildInputs = - [ - itk - vtk - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + itk + vtk + ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 239011dd7807..cbbc6ab194de 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -9,7 +9,6 @@ cpio, gawk, coreutils, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -101,7 +100,7 @@ stdenv.mkDerivation rec { gawk zlib bzip2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; + ]; strictDeps = true; diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 2fb6e386346a..ab17053cf6e2 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -7,7 +7,6 @@ pkg-config, libiconv, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -33,7 +32,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security ]; postInstall = '' diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index ec1e20a91329..82c0c8fa015f 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, installShellFiles, @@ -8,7 +7,6 @@ gfortran, lapack, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -27,16 +25,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = - [ - blas - gfortran.cc.lib - lapack - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + blas + gfortran.cc.lib + lapack + openssl + ]; # Enables build against a generic BLAS. buildFeatures = [ "netlib" ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 2d0634cec567..30b6494a7379 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -33,8 +33,6 @@ blas, lapack, curl, - Cocoa, - Foundation, libobjc, libcxx, tzdata, @@ -117,8 +115,6 @@ stdenv.mkDerivation (finalAttrs: { jdk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - Foundation libobjc libcxx ]; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4b9bd9e6fdcc..6314ee84599c 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -14,9 +14,6 @@ protobuf, doxygen, blas, - Accelerate, - CoreGraphics, - CoreVideo, lmdbSupport ? true, lmdb, leveldbSupport ? true, @@ -82,11 +79,6 @@ stdenv.mkDerivation rec { ++ lib.optionals pythonSupport [ python numpy - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreVideo ]; propagatedBuildInputs = lib.optionals pythonSupport ( diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index dfa7fbf8daf4..622030ebfd98 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -10,7 +10,6 @@ installShellFiles, asciidoctor, libiconv, - Security, }: rustPlatform.buildRustPackage rec { @@ -39,7 +38,6 @@ rustPlatform.buildRustPackage rec { [ curl libiconv - Security ] else [ openssl ] diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index b131fa6ee7f2..76a8bb0ca03f 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, installShellFiles, asciidoctor, }: @@ -36,8 +34,6 @@ rustPlatform.buildRustPackage rec { asciidoctor ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - postInstall = '' asciidoctor --backend=manpage git-gone.1.adoc -o git-gone.1 installManPage git-gone.1 diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index 5107fef5426f..f5e23de6893a 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, testers, git-stack, }: @@ -22,10 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-338iRd6zoy2O55sZ0h+s6i8kg4yXFBowRQLge9R9Bqs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - # Many tests try to access the file system. doCheck = false; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 974d878f264b..3eb9617ee22a 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -41,8 +41,6 @@ pythonSupport ? true, withpcre2 ? true, sendEmailSupport ? perlSupport, - Security, - CoreServices, nixosTests, withLibsecret ? false, pkg-config, @@ -160,10 +158,6 @@ stdenv.mkDerivation (finalAttrs: { tk ] ++ lib.optionals withpcre2 [ pcre2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - CoreServices - ] ++ lib.optionals withLibsecret [ glib libsecret diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/applications/version-management/gittyup/default.nix index cfe26c2de044..25e65657ce8d 100644 --- a/pkgs/applications/version-management/gittyup/default.nix +++ b/pkgs/applications/version-management/gittyup/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, cmark, - darwin, git, libssh2, lua5_4, @@ -60,24 +59,16 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = - [ - cmark - git - hunspell - libssh2 - lua5_4 - openssl - qtbase - qttools - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - ] - ); + buildInputs = [ + cmark + git + hunspell + libssh2 + lua5_4 + openssl + qtbase + qttools + ]; postInstall = '' # Those are not program libs, just some Qt5 libs that the build system leaks for some reason diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix index 3b5c389e70ed..f2295c428aa9 100644 --- a/pkgs/applications/version-management/lucky-commit/default.nix +++ b/pkgs/applications/version-management/lucky-commit/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, withOpenCL ? true, stdenv, - OpenCL, ocl-icd, }: @@ -22,7 +21,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8Z/bfSDjSrvGbPOVpvIYzOz5wxjkMsuwOWASnOA8ziM="; - buildInputs = lib.optional withOpenCL (if stdenv.hostPlatform.isDarwin then OpenCL else ocl-icd); + buildInputs = lib.optional (withOpenCL && (!stdenv.hostPlatform.isDarwin)) ocl-icd; buildNoDefaultFeatures = !withOpenCL; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 33c06e8e2d54..bc60bd3fcb54 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -16,7 +16,6 @@ guiSupport ? fullBuild, tk, highlightSupport ? fullBuild, - ApplicationServices, # test dependencies runCommand, unzip, @@ -78,7 +77,7 @@ let cargo rustc ]; - buildInputs = [ docutils ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; + buildInputs = [ docutils ]; makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust"; diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 56f2f8e463b1..68af1ce3c04c 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -7,9 +7,6 @@ linkFarm, jam, openssl, - CoreServices, - Foundation, - Security, testers, }: @@ -53,12 +50,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ jam ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Foundation - Security - ]; - outputs = [ "out" "bin" diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 535abf792679..a44df071c8de 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -16,12 +16,6 @@ fixup-yarn-lock, glibcLocales, libiconv, - Cocoa, - CoreFoundation, - CoreGraphics, - CoreServices, - Security, - WebKit, enableMinimal ? false, }: @@ -166,12 +160,6 @@ python311Packages.buildPythonApplication { ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl libiconv - Cocoa - CoreFoundation - CoreGraphics - CoreServices - Security - WebKit ]; HGNAME = "sl"; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 353f567172b4..5513f8bfd0f5 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -16,8 +16,6 @@ openssl, lz4, utf8proc, - CoreServices, - Security, autoconf, libtool, apacheHttpd ? null, diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix index 77bf7cfb8517..f7ded32020b6 100644 --- a/pkgs/applications/video/go2tv/default.nix +++ b/pkgs/applications/video/go2tv/default.nix @@ -1,12 +1,7 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, - Carbon, - Cocoa, - Kernel, - UserNotifications, xorg, libglvnd, pkg-config, @@ -28,23 +23,16 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXinerama - xorg.libXi - xorg.libXext - xorg.libXxf86vm - libglvnd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - Kernel - UserNotifications - ]; + buildInputs = [ + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXinerama + xorg.libXi + xorg.libXext + xorg.libXxf86vm + libglvnd + ]; ldflags = [ "-s" diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index cf660186976d..ebcdc89f4f1e 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -3,10 +3,6 @@ fetchFromGitHub, mkDerivation, stdenv, - Cocoa, - CoreAudio, - CoreFoundation, - MediaPlayer, SDL2, cmake, libGL, @@ -59,12 +55,6 @@ mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - CoreAudio - CoreFoundation - MediaPlayer ]; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index e156fee4a1ff..e880ffb89266 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -65,7 +65,6 @@ libjpegSupport ? true, libjpeg, useUnfreeCodecs ? false, - darwin, buildPackages, }: @@ -176,11 +175,7 @@ stdenv.mkDerivation { ++ lib.optional libpngSupport libpng ++ lib.optional libjpegSupport libjpeg ++ lib.optional bs2bSupport libbs2b - ++ lib.optional v4lSupport libv4l - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.OpenGL - ]; + ++ lib.optional v4lSupport libv4l; configurePlatforms = [ ]; configureFlags = diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index b3cd3512a74d..d2f21aceb9a9 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -8,7 +8,6 @@ frei0r, opencolorio, ffmpeg_6, - CoreFoundation, cmake, wrapQtAppsHook, openimageio, @@ -83,7 +82,7 @@ stdenv.mkDerivation { qtwayland qtmultimedia qttools - ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; + ]; meta = with lib; { description = "Professional open-source NLE video editor"; diff --git a/pkgs/applications/video/youtube-tui/default.nix b/pkgs/applications/video/youtube-tui/default.nix index b2e2f38bc33d..7c2a4d7f3f60 100644 --- a/pkgs/applications/video/youtube-tui/default.nix +++ b/pkgs/applications/video/youtube-tui/default.nix @@ -10,9 +10,6 @@ makeBinaryWrapper, libsixel, mpv, - CoreFoundation, - Security, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -35,18 +32,12 @@ rustPlatform.buildRustPackage rec { makeBinaryWrapper ]; - buildInputs = - [ - openssl - xorg.libxcb - libsixel - mpv - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - AppKit - ]; + buildInputs = [ + openssl + xorg.libxcb + libsixel + mpv + ]; # sixel-sys is dynamically linked to libsixel postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index c994cf7ec819..07a967ec301c 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -2,9 +2,6 @@ stdenv, lib, fetchFromGitHub, - Hypervisor, - vmnet, - xpc, libobjc, zlib, }: @@ -21,9 +18,6 @@ stdenv.mkDerivation rec { }; buildInputs = [ - Hypervisor - vmnet - xpc libobjc zlib ]; diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix index e3f89bacf54c..9c4e89bf3d55 100644 --- a/pkgs/build-support/mitm-cache/default.nix +++ b/pkgs/build-support/mitm-cache/default.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitHub, callPackage, rustPlatform, replaceVars, openssl, - Security, python3Packages, }: @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eY8mgmQB8wXQ7YJbLvdjXEEgGD+/RDywjvehJYf7ckE="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-DTPlPCumkVI2naYoNdO8T3pQNSawBA0FZ9LxVpqKqN0="; diff --git a/pkgs/build-support/wasm-bindgen-cli/default.nix b/pkgs/build-support/wasm-bindgen-cli/default.nix index 40c120c14b79..1cdbd5d9906a 100644 --- a/pkgs/build-support/wasm-bindgen-cli/default.nix +++ b/pkgs/build-support/wasm-bindgen-cli/default.nix @@ -8,7 +8,6 @@ openssl, stdenv, curl, - darwin, }: { @@ -28,7 +27,6 @@ rustPlatform.buildRustPackage { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.Security ]; nativeCheckInputs = [ nodejs_latest ]; diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix index 10d98113e0c3..f4966916c8ef 100644 --- a/pkgs/by-name/ad/adguardian/package.nix +++ b/pkgs/by-name/ad/adguardian/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-yPDysaslL/7N60eZ/hqZl5ZXIsof/pvlgHYfW1mIWtI="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home instance"; mainProgram = "adguardian"; diff --git a/pkgs/by-name/ae/aemu/package.nix b/pkgs/by-name/ae/aemu/package.nix index 03722e15320c..969ec27581df 100644 --- a/pkgs/by-name/ae/aemu/package.nix +++ b/pkgs/by-name/ae/aemu/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitiles, cmake, - darwin, }: stdenv.mkDerivation { @@ -23,9 +22,6 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; cmakeFlags = [ "-DAEMU_COMMON_GEN_PKGCONFIG=ON" diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index 305167f6ed5c..f39c4e8a6175 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -4,8 +4,6 @@ pkg-config, rustPlatform, fetchFromGitHub, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -22,16 +20,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-m6CFu0HA4e/9hWgYcRPjfa0h5vk0zwt5PqgvsuJuPNk="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/am/amber-secret/package.nix b/pkgs/by-name/am/amber-secret/package.nix index c62940c467d1..a05d3fbab349 100644 --- a/pkgs/by-name/am/amber-secret/package.nix +++ b/pkgs/by-name/am/amber-secret/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, }: @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Gwj0rnbKWifja5NJwskcrFpPoK15HjSQHXolGbgV784="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = { description = "Manage secret values in-repo via public key cryptography"; homepage = "https://github.com/fpco/amber"; diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix index 36f4a1ca6462..1c32dd578eba 100644 --- a/pkgs/by-name/am/amp/package.nix +++ b/pkgs/by-name/am/amp/package.nix @@ -9,7 +9,6 @@ xorg, cmake, libgit2, - darwin, curl, writableTmpDirAsHomeHook, }: @@ -41,14 +40,9 @@ rustPlatform.buildRustPackage rec { xorg.libxcb libgit2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - curl - Security - AppKit - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + ]; nativeCheckInputs = [ writableTmpDirAsHomeHook diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix index a04e31e6b3f5..9305dabc5f83 100644 --- a/pkgs/by-name/ar/artem/package.nix +++ b/pkgs/by-name/ar/artem/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # require internet access "--skip=arguments::input::url_input" diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix index a79fa32aae9b..c5d94322405a 100644 --- a/pkgs/by-name/as/asciinema-agg/package.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -2,13 +2,8 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { pname = "agg"; version = "1.5.0"; @@ -25,10 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-KQ4g4hWy8FZH4nLiB0874r8FCINXJboZ4C1dAAPA8Gc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - meta = with lib; { description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder"; homepage = "https://github.com/asciinema/agg"; diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 5e8c267dbf2d..99b38d0e0228 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -8,7 +8,6 @@ pkg-config, stdenv, installShellFiles, - darwin, crates ? [ "attic-client" ], }: rustPlatform.buildRustPackage { @@ -27,17 +26,10 @@ rustPlatform.buildRustPackage { installShellFiles ]; - buildInputs = - [ - nixVersions.nix_2_24 - boost - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); + buildInputs = [ + nixVersions.nix_2_24 + boost + ]; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM="; diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix index d46c6117c8ae..1c3350aabafb 100644 --- a/pkgs/by-name/au/authoscope/package.nix +++ b/pkgs/by-name/au/authoscope/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, installShellFiles, libcap, @@ -31,15 +29,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libcap - zlib - openssl - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libcap + zlib + openssl + ]; postInstall = '' installManPage docs/${pname}.1 diff --git a/pkgs/by-name/au/autotrace/package.nix b/pkgs/by-name/au/autotrace/package.nix index 40be3cef2fa8..c6505c519f05 100644 --- a/pkgs/by-name/au/autotrace/package.nix +++ b/pkgs/by-name/au/autotrace/package.nix @@ -11,7 +11,6 @@ imagemagick, libpng, pstoedit, - darwin, }: stdenv.mkDerivation rec { @@ -41,16 +40,12 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - glib - imagemagick - libpng - pstoedit - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + imagemagick + libpng + pstoedit + ]; meta = with lib; { homepage = "https://github.com/autotrace/autotrace"; diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index 1e0fdda3c287..db06e0ef5dff 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -3,7 +3,6 @@ buildNpmPackage, fetchFromGitHub, stdenv, - darwin, libsecret, pkg-config, python3, @@ -26,17 +25,9 @@ buildNpmPackage rec { pkg-config python3 ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libsecret - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin; - [ - Security - apple_sdk.frameworks.AppKit - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libsecret + ]; meta = { description = "An open source Azure Storage API compatible server"; diff --git a/pkgs/by-name/ba/bandwhich/package.nix b/pkgs/by-name/ba/bandwhich/package.nix index 65a9950e3061..234b5e1f176d 100644 --- a/pkgs/by-name/ba/bandwhich/package.nix +++ b/pkgs/by-name/ba/bandwhich/package.nix @@ -5,7 +5,6 @@ rustPlatform, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,8 +23,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/bi/bigloo/package.nix b/pkgs/by-name/bi/bigloo/package.nix index 054acfa7c8f1..c3bd3889c39d 100644 --- a/pkgs/by-name/bi/bigloo/package.nix +++ b/pkgs/by-name/bi/bigloo/package.nix @@ -6,7 +6,6 @@ automake, libtool, gmp, - darwin, libunistring, }: @@ -26,7 +25,6 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices libunistring ]; diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index c7220e10e5d7..699bb7a903b0 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -3,7 +3,6 @@ lib, fetchurl, removeReferencesTo, - darwin, perl, pkg-config, libcap, @@ -66,8 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux libcap ++ lib.optional enableGSSAPI libkrb5 - ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])); depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix index e1fdd004f087..2ab6721f8c36 100644 --- a/pkgs/by-name/bi/binsider/package.nix +++ b/pkgs/by-name/bi/binsider/package.nix @@ -1,6 +1,5 @@ { lib, - darwin, rustPlatform, fetchFromGitHub, stdenv, @@ -21,14 +20,6 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - ] - ); - checkType = "debug"; checkFlags = [ "--skip=test_extract_strings" diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 87dbe51ba6b5..3649f85dad17 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -1,9 +1,4 @@ { - Cocoa, - CoreGraphics, - ForceFeedback, - OpenAL, - OpenGL, SDL, addDriverRunpath, alembic, @@ -281,11 +276,6 @@ stdenv'.mkDerivation (finalAttrs: { ] else [ - Cocoa - CoreGraphics - ForceFeedback - OpenAL - OpenGL SDL brotli llvmPackages.openmp diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix index e3a5a8430d3b..d6ddad303494 100644 --- a/pkgs/by-name/bo/boa/package.nix +++ b/pkgs/by-name/bo/boa/package.nix @@ -7,8 +7,6 @@ bzip2, openssl, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -41,16 +39,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - bzip2 - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + bzip2 + openssl + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/bo/boringtun/package.nix b/pkgs/by-name/bo/boringtun/package.nix index f5dc75228c26..96e42e670390 100644 --- a/pkgs/by-name/bo/boringtun/package.nix +++ b/pkgs/by-name/bo/boringtun/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-9qvX6P/DquQDlt6wOzI5ZQXQzNil1cD7KiuegDXtrQ0="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - # Testing this project requires sudo, Docker and network access, etc. doCheck = false; diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix index b22741da77b0..d1e96531a95d 100644 --- a/pkgs/by-name/br/browsers/package.nix +++ b/pkgs/by-name/br/browsers/package.nix @@ -10,8 +10,6 @@ glib, gtk3, pango, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,21 +31,14 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = - [ - atk - cairo - gdk-pixbuf - glib - gtk3 - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreText - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + pango + ]; postInstall = '' install -m 444 \ diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index 1928ced398f6..6d73ad238382 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, versionCheckHook, nix-update-script, }: @@ -22,15 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-2pgQB2myEnLvrU3ApNL/bwaVcGku+X/TjR6YBqXD7Xg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - IOKit - SystemConfiguration - ] - ); - nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/bw/bws/package.nix b/pkgs/by-name/bw/bws/package.nix index e7003dc22984..8bc8bdd91761 100644 --- a/pkgs/by-name/bw/bws/package.nix +++ b/pkgs/by-name/bw/bws/package.nix @@ -7,7 +7,6 @@ oniguruma, openssl, stdenv, - darwin, python3, perl, }: @@ -41,9 +40,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix index d8a4365afe6f..1d96951ac59c 100644 --- a/pkgs/by-name/ca/cairo/package.nix +++ b/pkgs/by-name/ca/cairo/package.nix @@ -21,7 +21,6 @@ glib, xcbSupport ? x11Support, libxcb, - darwin, testers, }: @@ -60,19 +59,9 @@ stdenv.mkDerivation ( python3 ]; - buildInputs = - [ - docbook_xsl - ] - ++ optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreGraphics - CoreText - ApplicationServices - Carbon - ] - ); + buildInputs = [ + docbook_xsl + ]; patches = [ # Pull upstream fix to fix "out of memory" errors: diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix index 6495652b190b..ca43b5ba79cb 100644 --- a/pkgs/by-name/ca/cargo-about/package.nix +++ b/pkgs/by-name/ca/cargo-about/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,12 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ zstd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ zstd ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index f14a0081cd40..809edb20ac34 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -6,8 +6,6 @@ bzip2, xz, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + xz + zstd + ]; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix index 3a4c056117ba..fd690616a5bf 100644 --- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix +++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - darwin, rustPlatform, pkg-config, openssl, @@ -43,12 +42,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; useFetchCargoVendor = true; cargoHash = "sha256-SigRm2ZC7jH1iCEGRpka1G/e9kBEieFVU0YDBl2LfTM="; diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix index af31e5f60aab..d1985e7a460f 100644 --- a/pkgs/by-name/ca/cargo-bump/package.nix +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Increments the version number of the current project"; mainProgram = "cargo-bump"; diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix index 13c8f86603a9..3001f1ae4020 100644 --- a/pkgs/by-name/ca/cargo-bundle/package.nix +++ b/pkgs/by-name/ca/cargo-bundle/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pkg-config, stdenv, - darwin, libxkbcommon, wayland, }: @@ -28,14 +27,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libxkbcommon - wayland - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libxkbcommon + wayland + ]; meta = with lib; { description = "Wrap rust executables in OS-specific app bundles"; diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix index 9d052d9df626..8deaf38fa346 100644 --- a/pkgs/by-name/ca/cargo-component/package.nix +++ b/pkgs/by-name/ca/cargo-component/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; # requires the wasm32-wasi target doCheck = false; diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index 61bfb416f9af..6e8cf25fc729 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ca/cargo-dephell/package.nix b/pkgs/by-name/ca/cargo-dephell/package.nix index d0fbd26e846e..2d20d48146b7 100644 --- a/pkgs/by-name/ca/cargo-dephell/package.nix +++ b/pkgs/by-name/ca/cargo-dephell/package.nix @@ -6,7 +6,6 @@ stdenv, curl, openssl, - darwin, libgit2, }: @@ -39,7 +38,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.Security libgit2 ]; diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix index d97e19fb6a5e..072522b8d476 100644 --- a/pkgs/by-name/ca/cargo-dist/package.nix +++ b/pkgs/by-name/ca/cargo-dist/package.nix @@ -7,8 +7,6 @@ bzip2, xz, zstd, - stdenv, - darwin, git, rustup, }: @@ -31,15 +29,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + xz + zstd + ]; nativeCheckInputs = [ git diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix index 8ab9656c8c22..e2fb19230887 100644 --- a/pkgs/by-name/ca/cargo-duplicates/package.nix +++ b/pkgs/by-name/ca/cargo-duplicates/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,16 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; meta = with lib; { description = "Cargo subcommand for displaying when different versions of a same dependency are pulled in"; diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index edfa3438a50d..e1ba2897a054 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -4,9 +4,8 @@ fetchFromGitHub, rustPlatform, pkg-config, - openssl, # darwin dependencies - darwin, + openssl, libiconv, curl, }: @@ -36,15 +35,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - libiconv - curl - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + curl + ]; nativeBuildInputs = [ pkg-config ] # curl-sys wants to run curl-config on darwin diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix index 3c4d01d28f37..668174e7aede 100644 --- a/pkgs/by-name/ca/cargo-generate/package.nix +++ b/pkgs/by-name/ca/cargo-generate/package.nix @@ -7,7 +7,6 @@ libgit2, openssl, stdenv, - darwin, gitMinimal, }: @@ -36,14 +35,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + ]; nativeCheckInputs = [ gitMinimal ]; diff --git a/pkgs/by-name/ca/cargo-guppy/package.nix b/pkgs/by-name/ca/cargo-guppy/package.nix index e4d839f57aa4..f7ee8b1fc56e 100644 --- a/pkgs/by-name/ca/cargo-guppy/package.nix +++ b/pkgs/by-name/ca/cargo-guppy/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -24,11 +22,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix index a9f2a69a3a1d..4225e0690651 100644 --- a/pkgs/by-name/ca/cargo-info/package.nix +++ b/pkgs/by-name/ca/cargo-info/package.nix @@ -4,8 +4,6 @@ fetchFromGitLab, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Cargo subcommand to show crates info from crates.io"; diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index 51dde7bc7058..21527f9b2e59 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -1,19 +1,8 @@ { - darwin, fetchFromGitHub, lib, rustPlatform, - stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) - CoreServices - SystemConfiguration - Security - ; - inherit (lib) optionals; - inherit (stdenv.hostPlatform) isDarwin; -in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; version = "0.2.28"; @@ -28,12 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Da9ei4yAOfhSQmQgrUDZCmMeJXTfGnYhI1+L0JT/ECs="; - buildInputs = optionals isDarwin [ - SystemConfiguration - Security - CoreServices - ]; - # https://github.com/leptos-rs/cargo-leptos#dependencies buildFeatures = [ "no_downloads" ]; # cargo-leptos will try to install missing dependencies on its own otherwise doCheck = false; # Check phase tries to query crates.io diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix index 33851806f7ea..f4b30c6b4250 100644 --- a/pkgs/by-name/ca/cargo-local-registry/package.nix +++ b/pkgs/by-name/ca/cargo-local-registry/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,19 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; # tests require internet access doCheck = false; diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index 5581bad62b2a..71ef2c04fe79 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -6,8 +6,6 @@ installShellFiles, bzip2, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,14 +27,10 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - bzip2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + ]; postInstall = '' installShellCompletion extra/shell/*.bash diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index 89cd6327686f..4dd3cd3e6a42 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -1,17 +1,14 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, git, - darwin, makeWrapper, }: let - inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; version = "0.17.6"; in @@ -37,7 +34,7 @@ rustPlatform.buildRustPackage { export CARGO_HOME=$out/share/ ''; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config git diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix index c9d50be042e8..204189edcb52 100644 --- a/pkgs/by-name/ca/cargo-public-api/package.nix +++ b/pkgs/by-name/ca/cargo-public-api/package.nix @@ -5,8 +5,6 @@ pkg-config, curl, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; # Tests fail doCheck = false; diff --git a/pkgs/by-name/ca/cargo-raze/package.nix b/pkgs/by-name/ca/cargo-raze/package.nix index b3e40543ed3f..380e4a737475 100644 --- a/pkgs/by-name/ca/cargo-raze/package.nix +++ b/pkgs/by-name/ca/cargo-raze/package.nix @@ -7,7 +7,6 @@ curl, libgit2, openssl, - darwin, }: let version = "0.16.1"; @@ -37,7 +36,7 @@ rustPlatform.buildRustPackage { libgit2 openssl curl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin issue: Os { code: 24, kind: Uncategorized, message: "Too many open files" } diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index c57bc18292b3..5594a8602be1 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -15,10 +13,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lVu9w8l3+SeqiMoQ8Bjoslf7tWz49jrrE4g/pDU1axI="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8="; diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index 8e91c3c5bb22..8d755e78ef27 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -7,7 +7,6 @@ openssl, stdenv, curl, - darwin, git, }: @@ -36,7 +35,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index 629d422ec522..4b5e36a361db 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, cmake, zlib, - stdenv, - darwin, testers, cargo-semver-checks, nix-update-script, @@ -29,13 +27,9 @@ rustPlatform.buildRustPackage rec { cmake ]; - buildInputs = - [ - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + zlib + ]; checkFlags = [ # requires internet access diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index 157a1f175e8c..2e34afa3bd49 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,15 +23,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + zlib + ]; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix index 95431b78947f..36b9aca3122c 100644 --- a/pkgs/by-name/ca/cargo-supply-chain/package.nix +++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-fsW3qTyFMcj/OTouOah1ZFskw075V8jBwhs02AxY7kU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Gather author, contributor and publisher data on crates in your dependency graph"; mainProgram = "cargo-supply-chain"; diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index 12e3586d2fad..23d055bb2dc6 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,15 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-aSOEaHlUeP8D0GDdI6iLnuRHFasTt1nM6EGzYxhIPvo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - DiskArbitration - Foundation - IOKit - ] - ); - meta = with lib; { description = "Graph the number of crates that depend on your crate over time"; mainProgram = "cargo-tally"; diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix index 65a41aa8ca91..d59ff0f0ac72 100644 --- a/pkgs/by-name/ca/cargo-ui/package.nix +++ b/pkgs/by-name/ca/cargo-ui/package.nix @@ -10,7 +10,6 @@ fontconfig, libGL, xorg, - darwin, }: rustPlatform.buildRustPackage rec { @@ -43,9 +42,6 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr xorg.libxcb - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit ]; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix index c669ab159ed6..7502501d53df 100644 --- a/pkgs/by-name/ca/cargo-unused-features/package.nix +++ b/pkgs/by-name/ca/cargo-unused-features/package.nix @@ -6,8 +6,6 @@ pkg-config, libgit2, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,16 +25,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + curl + libgit2 + openssl + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 2dc1c2ca2082..034b7544eed2 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -12,7 +12,6 @@ libssh2, openssl, zlib, - darwin, }: rustPlatform.buildRustPackage rec { @@ -47,7 +46,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.Security ]; postBuild = '' diff --git a/pkgs/by-name/ca/cargo-vibe/package.nix b/pkgs/by-name/ca/cargo-vibe/package.nix index 841d7b57ea69..1f0afa5289b0 100644 --- a/pkgs/by-name/ca/cargo-vibe/package.nix +++ b/pkgs/by-name/ca/cargo-vibe/package.nix @@ -7,7 +7,6 @@ dbus, udev, openssl, - darwin, }: rustPlatform.buildRustPackage { pname = "cargo-vibe"; @@ -26,20 +25,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - dbus - openssl - ] - ++ lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - IOKit - CoreBluetooth - ] - ); + buildInputs = [ + dbus + openssl + ] ++ lib.optional stdenv.hostPlatform.isLinux udev; meta = with lib; { description = "Cargo x Buttplug.io"; diff --git a/pkgs/by-name/ca/cargo-wasi/package.nix b/pkgs/by-name/ca/cargo-wasi/package.nix index ce9289c1a8cf..52772adaaf6e 100644 --- a/pkgs/by-name/ca/cargo-wasi/package.nix +++ b/pkgs/by-name/ca/cargo-wasi/package.nix @@ -5,7 +5,6 @@ pkg-config, stdenv, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,9 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix index 219553af4b60..59befd9ae071 100644 --- a/pkgs/by-name/ca/cargo-workspaces/package.nix +++ b/pkgs/by-name/ca/cargo-workspaces/package.nix @@ -6,8 +6,6 @@ libssh2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,16 +24,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libssh2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libssh2 + openssl + zlib + ]; env = { LIBSSH2_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ce/cegui/package.nix b/pkgs/by-name/ce/cegui/package.nix index b3293c2ef5c2..241624683aeb 100644 --- a/pkgs/by-name/ce/cegui/package.nix +++ b/pkgs/by-name/ce/cegui/package.nix @@ -7,7 +7,6 @@ freetype, boost, expat, - darwin, libiconv, unstableGitUpdater, }: @@ -37,8 +36,6 @@ stdenv.mkDerivation { expat ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Foundation libiconv ]; diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix index 48ef60083dde..acc76f8f5302 100644 --- a/pkgs/by-name/ce/celeste/package.nix +++ b/pkgs/by-name/ce/celeste/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - darwin, just, pkg-config, wrapGAppsHook4, @@ -58,22 +57,17 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook4 ]; - buildInputs = - [ - cairo - dbus - gdk-pixbuf - glib - graphene - gtk4 - libadwaita - librclone - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + cairo + dbus + gdk-pixbuf + glib + graphene + gtk4 + libadwaita + librclone + pango + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix index 073c6ce3ed9c..b5f79fdd1a86 100644 --- a/pkgs/by-name/ce/certinfo/package.nix +++ b/pkgs/by-name/ce/certinfo/package.nix @@ -4,7 +4,6 @@ buildGo123Module, fetchFromGitHub, libX11, - darwin, }: buildGo123Module rec { @@ -21,10 +20,7 @@ buildGo123Module rec { # clipboard functionality not working on Darwin doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); - buildInputs = - [ ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; vendorHash = null; diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix index a9d848a59619..46c3ab7c0d04 100644 --- a/pkgs/by-name/ch/chainsaw/package.nix +++ b/pkgs/by-name/ch/chainsaw/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-LTvCExHQnQIbGGeh4bK6b3r9XXOxREMTOlRQv+BjKrM="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; - ldflags = [ "-w" "-s" diff --git a/pkgs/by-name/ch/chatgpt/package.nix b/pkgs/by-name/ch/chatgpt/package.nix index 0dc77de11805..9799e446af64 100644 --- a/pkgs/by-name/ch/chatgpt/package.nix +++ b/pkgs/by-name/ch/chatgpt/package.nix @@ -1,7 +1,6 @@ { lib, stdenvNoCC, - darwin, fetchurl, _7zz, undmg, diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix index a5147b3ae705..4c63aa50be43 100644 --- a/pkgs/by-name/ch/checkpwn/package.nix +++ b/pkgs/by-name/ch/checkpwn/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8ALu1Ij4o2fdsRWhlWu6rOIfHZjIIC+fHJ07XIbH66s="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # requires internet access checkFlags = [ "--skip=test_cli_" diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix index ea40863dd6b6..b1ea2ba7875a 100644 --- a/pkgs/by-name/ch/cherrybomb/package.nix +++ b/pkgs/by-name/ch/cherrybomb/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-j9CT2HHFY4ANWKvx8t/jgCc3aOiSEJlq8CHstjSc+O4="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "CLI tool that helps you avoid undefined user behavior by validating your API specifications"; mainProgram = "cherrybomb"; diff --git a/pkgs/by-name/ch/chit/package.nix b/pkgs/by-name/ch/chit/package.nix index dc9fa955817f..218d867f4482 100644 --- a/pkgs/by-name/ch/chit/package.nix +++ b/pkgs/by-name/ch/chit/package.nix @@ -5,7 +5,6 @@ pkg-config, stdenv, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,13 +24,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; # update Carg.lock to work with openssl 3 postPatch = '' diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 61b8766d6501..73175713bbe9 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -8,7 +8,6 @@ cmake, ninja, ffmpeg-headless, - darwin, zlib, testers, validatePkgConfig, @@ -57,15 +56,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ffmpeg-headless ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreGraphics - CoreVideo - zlib - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + zlib + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_EXAMPLES" withExamples) diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix index 7fc6357ac63b..b0a21ab3349c 100644 --- a/pkgs/by-name/ci/citations/package.nix +++ b/pkgs/by-name/ci/citations/package.nix @@ -1,6 +1,5 @@ { cargo, - darwin, desktop-file-utils, fetchFromGitLab, gettext, @@ -52,17 +51,13 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; - buildInputs = - [ - glib - gtk4 - gtksourceview5 - libadwaita - poppler - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + gtk4 + gtksourceview5 + libadwaita + poppler + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang ( lib.concatStringsSep " " [ diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix index a7eedd645738..5b12ce60d3d1 100644 --- a/pkgs/by-name/cl/clfft/package.nix +++ b/pkgs/by-name/cl/clfft/package.nix @@ -8,11 +8,9 @@ boost, opencl-clhpp, ocl-icd, - darwin, }: let - inherit (darwin.apple_sdk.frameworks) OpenCL; stdenv = gccStdenv; in stdenv.mkDerivation rec { @@ -43,8 +41,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ opencl-clhpp ocl-icd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ]; + ]; # https://github.com/clMathLibraries/clFFT/issues/237 CXXFLAGS = "-std=c++98"; diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix index e1bd2d3d888a..96afcd703127 100644 --- a/pkgs/by-name/cl/click/package.nix +++ b/pkgs/by-name/cl/click/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, rustPlatform, lib, @@ -24,9 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; meta = with lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix index 1e73159f8062..650ccfacf768 100644 --- a/pkgs/by-name/cl/clima/package.nix +++ b/pkgs/by-name/cl/clima/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-3BNDo5ksra1d8X6yQZYSlS2CSiZfkuTHkQtIC2ckbKE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Minimal viewer for Termimad"; homepage = "https://github.com/Canop/clima"; diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix index d2d0651f5123..5ed2283649a3 100644 --- a/pkgs/by-name/cl/clipboard-jh/package.nix +++ b/pkgs/by-name/cl/clipboard-jh/package.nix @@ -9,7 +9,6 @@ wayland-scanner, wayland, xorg, - darwin, nix-update-script, alsa-lib, openssl, @@ -44,9 +43,6 @@ stdenv.mkDerivation rec { wayland xorg.libX11 alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit ]; cmakeBuildType = "MinSizeRel"; diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index 22597dd1f781..66bfcc8dab99 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -5,7 +5,6 @@ rustPlatform, protobuf, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -22,12 +21,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-UA+NTtZ2qffUPUmvCidnTHwFzD3WOPTlxHR2e2vKwPQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - nativeBuildInputs = [ protobuf installShellFiles diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 281570d99ab1..67fad206fe40 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -29,13 +29,11 @@ useSharedLibraries ? (!isMinimalBuild && !stdenv.hostPlatform.isCygwin), uiToolkits ? [ ], # can contain "ncurses" and/or "qt5" buildDocs ? !(isMinimalBuild || (uiToolkits == [ ])), - darwin, libsForQt5, gitUpdater, }: let - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; inherit (libsForQt5) qtbase wrapQtAppsHook; cursesUI = lib.elem "ncurses" uiToolkits; qt5UI = lib.elem "qt5" uiToolkits; @@ -117,9 +115,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses - ++ lib.optional qt5UI qtbase - ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices - ++ lib.optional (stdenv.hostPlatform.isDarwin && !isMinimalBuild) SystemConfiguration; + ++ lib.optional qt5UI qtbase; preConfigure = '' fixCmakeFiles . diff --git a/pkgs/by-name/cm/cminpack/package.nix b/pkgs/by-name/cm/cminpack/package.nix index 08f5ea016148..7d2b48cd3d13 100644 --- a/pkgs/by-name/cm/cminpack/package.nix +++ b/pkgs/by-name/cm/cminpack/package.nix @@ -2,7 +2,6 @@ lib, stdenv, cmake, - darwin, fetchFromGitHub, withBlas ? true, blas, @@ -25,15 +24,9 @@ stdenv.mkDerivation rec { cmake ]; - buildInputs = - lib.optionals withBlas [ - blas - ] - ++ lib.optionals (withBlas && stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.Accelerate - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreVideo - ]; + buildInputs = lib.optionals withBlas [ + blas + ]; cmakeFlags = [ "-DUSE_BLAS=${if withBlas then "ON" else "OFF"}" diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix index 03c5e6e7b0a8..4170d25e5e63 100644 --- a/pkgs/by-name/co/code2prompt/package.nix +++ b/pkgs/by-name/co/code2prompt/package.nix @@ -4,8 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,12 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = [ openssl ]; meta = { description = "A CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting"; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index c95d906d22c9..dea953494d25 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitea, installShellFiles, lib, @@ -27,18 +26,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - let - d = darwin.apple_sdk.frameworks; - in - [ - d.CoreServices - d.Security - d.SystemConfiguration - ] - ); + buildInputs = [ openssl ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd berg \ diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix index f8c073ab8ce9..26d3d9eb6ba8 100644 --- a/pkgs/by-name/co/coinlive/package.nix +++ b/pkgs/by-name/co/coinlive/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, openssl, pkg-config, @@ -25,13 +23,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/co/conserve/package.nix b/pkgs/by-name/co/conserve/package.nix index 2095e4091881..831fc448615b 100644 --- a/pkgs/by-name/co/conserve/package.nix +++ b/pkgs/by-name/co/conserve/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-r14ApN9kGWIyeNlbqrb+vOvvmH2n+O5ovvtSVNTMASo="; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # expected to panic if unix user has no secondary group, # which is the case in the nix sandbox diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 2a56fd2830a7..81ca074ff9cb 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -7,7 +7,6 @@ libiconv, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,7 +32,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; checkFlags = [ diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index a45cbf962503..5f873a8fdd61 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitHub, buildNpmPackage, rustPlatform, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; postPatch = '' rm -rf "ui/public" diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix index 7569bdb81082..f088947528c2 100644 --- a/pkgs/by-name/co/copycat/package.nix +++ b/pkgs/by-name/co/copycat/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-gjFVvP2h+HJdDdNVtqTT1E1s4ZYXfWuhtMBRJkWRcDw="; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk_11_0.frameworks.AppKit - ]; - meta = { description = "Utility to copy project tree contents to clipboard"; homepage = "https://github.com/DeeKahy/CopyCat"; diff --git a/pkgs/by-name/cr/crabfit-api/package.nix b/pkgs/by-name/cr/crabfit-api/package.nix index 7012a40ea5b2..abffd72bd555 100644 --- a/pkgs/by-name/cr/crabfit-api/package.nix +++ b/pkgs/by-name/cr/crabfit-api/package.nix @@ -8,8 +8,6 @@ protobuf, openssl, sqlite, - stdenv, - darwin, adaptor ? "sql", }: @@ -53,16 +51,10 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = - [ - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + sqlite + ]; buildFeatures = [ "${adaptor}-adaptor" ]; diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix index b5842124d09e..6d84f0302b14 100644 --- a/pkgs/by-name/cs/csvlens/package.nix +++ b/pkgs/by-name/cs/csvlens/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, }: @@ -17,10 +15,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JlyDw+VL/vpKTvvBlDIwVIovhKJX2pV4UTY47cLR1IE="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - useFetchCargoVendor = true; cargoHash = "sha256-nfw8mMauOTDCBh9O2ye96p8WXDFta4DXXb9kJVz7f3E="; diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index fe28b750ab15..c6fd0ebeee21 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, pkg-config, perl, nixosTests, @@ -158,15 +157,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional wolfsslSupport wolfssl ++ lib.optional rustlsSupport rustls-ffi ++ lib.optional zlibSupport zlib - ++ lib.optional zstdSupport zstd - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - CoreServices - SystemConfiguration - ] - ); + ++ lib.optional zstdSupport zstd; # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html preConfigure = '' diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index 649d3757879f..7bb238cd612c 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -13,7 +13,6 @@ udev, unzip, xorg, - darwin, }: let @@ -65,34 +64,20 @@ stdenv.mkDerivation rec { (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux ( - with xorg; - [ - libXScrnSaver - libXdamage - libXtst - libxshmfence - nss - gtk2 - alsa-lib - gtk3 - libgbm - ] - ) - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - CoreServices - CoreMedia - CoreAudio - AudioToolbox - AVFoundation - Foundation - ApplicationServices - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux ( + with xorg; + [ + libXScrnSaver + libXdamage + libXtst + libxshmfence + nss + gtk2 + alsa-lib + gtk3 + libgbm + ] + ); runtimeDependencies = lib.optional stdenv.hostPlatform.isLinux (lib.getLib udev); diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index a617fc7fa180..b91a675818be 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -3,7 +3,6 @@ atk, cairo, callPackage, - darwin, fetchFromGitHub, gdk-pixbuf, glib, @@ -45,22 +44,14 @@ let wrapGAppsHook4 ]; - buildInputs = - [ - atk - cairo - gdk-pixbuf - glib - gtk4 - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Foundation - ] - ); + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk4 + pango + ]; nativeCheckInputs = [ xvfb-run ]; diff --git a/pkgs/by-name/da/dailies/package.nix b/pkgs/by-name/da/dailies/package.nix index ab126bda6876..6893c8f0502b 100644 --- a/pkgs/by-name/da/dailies/package.nix +++ b/pkgs/by-name/da/dailies/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "dailies"; version = "0.1.0"; @@ -17,11 +15,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hT+tffJ4F4VfblfYmb1o0hl5EZjU/QOgDYudKS8EvJg="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; - cargoHash = "sha256-R8r6YFo0Ih7esJl/OpcNNmmmB9pGxOXCc+3/ZivaWSw="; meta = with lib; { diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix index dde3104c7622..2fcd06953ac4 100644 --- a/pkgs/by-name/da/daktilo/package.nix +++ b/pkgs/by-name/da/daktilo/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, unixtools, pkg-config, alsa-lib, @@ -30,16 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - alsa-lib - xorg.libX11 - xorg.libXi - xorg.libXtst - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + alsa-lib + xorg.libX11 + xorg.libXi + xorg.libXtst + ]; nativeCheckInputs = [ unixtools.script diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix index 29e620568ab5..666bc7ba60d5 100644 --- a/pkgs/by-name/da/darklua/package.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, }: @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-DQkj4t+l6FJnJQ+g96CXypssbRzHbS6X9AOG0LGDclg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' rm .cargo/config.toml diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 3b1d7284116f..09d42765609d 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-qJjZ4Um2K27IJy7w99kJGs5ZB1y57xd6P896+Hm2GOg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # Some tests not found fake path "--skip=catalog::tests::query_gs_location_test" diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index ad7130123726..0f709042822f 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -12,7 +12,6 @@ python3, rustPlatform, stdenv, - darwin, testers, deltachat-desktop, yq, @@ -65,10 +64,6 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; VERSION_INFO_GIT_REF = finalAttrs.src.tag; diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix index f5f9e30197a2..e618554e01b5 100644 --- a/pkgs/by-name/de/deploy-rs/package.nix +++ b/pkgs/by-name/de/deploy-rs/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage { @@ -20,11 +18,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-e+Exc0lEamAieZ7QHJBYvmnmM/9YHdLRD3La4U5FRMo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - meta = { description = "Multi-profile Nix-flake deploy tool"; homepage = "https://github.com/serokell/deploy-rs"; diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index fa273a1b4040..01a3eebb0880 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index 80a957991a90..fafc747564fb 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -18,7 +18,6 @@ libadwaita, pango, gettext, - darwin, blueprint-compiler, nix-update-script, }: @@ -51,24 +50,15 @@ stdenv.mkDerivation rec { blueprint-compiler ]; - buildInputs = - [ - cairo - gdk-pixbuf - glib - gtk4 - libadwaita - openssl - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Foundation - Security - ] - ); + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + libadwaita + openssl + pango + ]; # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys # because the vendored copy does not build with newer versions of clang. diff --git a/pkgs/by-name/di/dim/package.nix b/pkgs/by-name/di/dim/package.nix index 9369e055d850..2ead070f750d 100644 --- a/pkgs/by-name/di/dim/package.nix +++ b/pkgs/by-name/di/dim/package.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, buildNpmPackage, - darwin, makeWrapper, ffmpeg, git, @@ -85,14 +84,7 @@ rustPlatform.buildRustPackage (finalAttrs: { git ]; - buildInputs = - [ sqlite ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ] - ++ lib.optional libvaSupport libva; + buildInputs = [ sqlite ] ++ lib.optional libvaSupport libva; buildFeatures = lib.optional libvaSupport "vaapi"; diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix index 5d491178bd3b..da7faadf9365 100644 --- a/pkgs/by-name/di/diswall/package.nix +++ b/pkgs/by-name/di/diswall/package.nix @@ -1,14 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { pname = "diswall"; version = "0.6.1"; @@ -20,10 +15,6 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-t2ZBi3ab6OUWzc0L0Hq/ay+s3KNDMeu6mkYxti48BuE="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-I4jfeOtK+ho2jksGHgQqHE+L6UzS240t+7v3/Eb/xAs="; diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index 3c181f50deb4..0bd513a08e5c 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -15,7 +15,6 @@ curl, tzdata, gdb, - Foundation, callPackage, targetPackages, fetchpatch, @@ -138,14 +137,10 @@ stdenv.mkDerivation (finalAttrs: { git ]; - buildInputs = - [ - curl - tzdata - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; + buildInputs = [ + curl + tzdata + ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/do/dockutil/package.nix b/pkgs/by-name/do/dockutil/package.nix index 264523e970fd..598f504eb993 100644 --- a/pkgs/by-name/do/dockutil/package.nix +++ b/pkgs/by-name/do/dockutil/package.nix @@ -8,7 +8,6 @@ swiftpm, swiftpm2nix, swiftPackages, - darwin, libarchive, p7zip, # Building from source on x86_64 fails (among other things) due to: @@ -56,8 +55,6 @@ let swiftpm ]; - buildInputs = with darwin.apple_sdk.frameworks; [ Cocoa ]; - configurePhase = generated.configure; installPhase = '' diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix index 854a56de0709..d1cd037a130b 100644 --- a/pkgs/by-name/do/doctave/package.nix +++ b/pkgs/by-name/do/doctave/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,10 +26,6 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = { description = "Batteries-included developer documentation site generator"; homepage = "https://github.com/doctave/doctave"; diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix index 1ce408dfdabc..90cb06b6babb 100644 --- a/pkgs/by-name/do/docuum/package.nix +++ b/pkgs/by-name/do/docuum/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { "--skip=format::tests::code_str_display" ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; - meta = with lib; { description = "Least recently used (LRU) eviction of Docker images"; homepage = "https://github.com/stepchowfun/docuum"; diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix index 0a6a950e93f1..23f798d7061a 100644 --- a/pkgs/by-name/do/dogedns/package.nix +++ b/pkgs/by-name/do/dogedns/package.nix @@ -7,7 +7,6 @@ pkg-config, openssl, pandoc, - darwin, }: rustPlatform.buildRustPackage rec { @@ -45,9 +44,7 @@ rustPlatform.buildRustPackage rec { installShellFiles pandoc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; postInstall = '' installShellCompletion completions/doge.{bash,fish,zsh} diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix index 7b4398e1e2bb..e7c1e70b8d6e 100644 --- a/pkgs/by-name/do/done/package.nix +++ b/pkgs/by-name/do/done/package.nix @@ -16,7 +16,6 @@ libsecret, openssl, sqlite, - darwin, gettext, }: @@ -48,18 +47,14 @@ stdenv.mkDerivation rec { wrapGAppsHook4 ]; - buildInputs = - [ - gdk-pixbuf - gtk4 - libadwaita - libsecret - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = [ + gdk-pixbuf + gtk4 + libadwaita + libsecret + openssl + sqlite + ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { GETTEXT_DIR = gettext; diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix index 2eb11cd61ea4..b332fafe1aa5 100644 --- a/pkgs/by-name/do/doomretro/package.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -4,15 +4,11 @@ SDL2_image, SDL2_mixer, cmake, - darwin, fetchFromGitHub, pkg-config, stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; version = "5.6.2"; @@ -33,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_image SDL2_mixer - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; strictDeps = true; diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index 87339d21f6f9..789fa76979b9 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, nix-update-script, rustPlatform, - darwin, which, installShellFiles, }: @@ -23,10 +22,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-UBZZu8D1fbNOn2obviP+/Qw+E/OoNKRA4NXzqCqghGs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - nativeCheckInputs = [ which installShellFiles diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix index ba98905413e8..b85ad1a50ba5 100644 --- a/pkgs/by-name/dp/dpkg/package.nix +++ b/pkgs/by-name/dp/dpkg/package.nix @@ -15,7 +15,6 @@ pkg-config, diffutils, glibc ? !stdenv.hostPlatform.isDarwin, - darwin, }: stdenv.mkDerivation rec { @@ -86,7 +85,7 @@ stdenv.mkDerivation rec { xz zstd libmd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ]; nativeBuildInputs = [ makeWrapper perl diff --git a/pkgs/by-name/dt/dtool/package.nix b/pkgs/by-name/dt/dtool/package.nix index 3d154e94567f..3420b9e8db97 100644 --- a/pkgs/by-name/dt/dtool/package.nix +++ b/pkgs/by-name/dt/dtool/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,10 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-C0H5cIMMfUPJ2iJCUs1jEu3Ln8CdDgbgstMnH/f9FRY="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; # FIXME: remove patch when upstream version of rustc-serialize is updated cargoPatches = [ ./rustc-serialize-fix.patch ]; diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix index b62086b95b52..f7e22cd77abc 100644 --- a/pkgs/by-name/du/dufs/package.nix +++ b/pkgs/by-name/du/dufs/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # FIXME: checkPhase on darwin will leave some zombie spawn processes # see https://github.com/NixOS/nixpkgs/issues/205620 doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index a1176888b5a0..7ee666de7072 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,13 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-uuY0nh4VHzyM7+cbgyycr5I3IjE0OeQ0eg12qVXe4BQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); - meta = with lib; { description = "Connect A to B - Send Data"; homepage = "https://www.dumbpipe.dev/"; diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index ea3406aa4c01..d212809cf1de 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -2,8 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-bjNB0aoG9Mrz1JzD80j2Czfg0pfU2uGlFFsi5WO4pdU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Super simple HTTP server that replies a fixed body with a fixed response code"; homepage = "https://github.com/svenstaro/dummyhttp"; diff --git a/pkgs/by-name/dv/dvdplusrwtools/package.nix b/pkgs/by-name/dv/dvdplusrwtools/package.nix index e16f95fe7412..49bb2b6e1948 100644 --- a/pkgs/by-name/dv/dvdplusrwtools/package.nix +++ b/pkgs/by-name/dv/dvdplusrwtools/package.nix @@ -5,12 +5,8 @@ fetchpatch, cdrtools, m4, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) IOKit; -in stdenv.mkDerivation rec { pname = "dvd+rw-tools"; version = "7.1"; @@ -76,7 +72,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ m4 ]; - buildInputs = [ cdrtools ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + buildInputs = [ cdrtools ]; makeFlags = [ "prefix=${placeholder "out"}" diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 305dbbd60330..39871a0e8bea 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -5,7 +5,6 @@ rustPlatform, protobuf, nix-update-script, - darwin, withQuic ? false, # with QUIC protocol support }: @@ -29,10 +28,6 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - buildNoDefaultFeatures = stdenv.hostPlatform.isMips; buildFeatures = lib.optional stdenv.hostPlatform.isMips "mips" ++ lib.optional withQuic "quic"; diff --git a/pkgs/by-name/ed/edge-runtime/package.nix b/pkgs/by-name/ed/edge-runtime/package.nix index e6133bf1389e..19607f2c995c 100644 --- a/pkgs/by-name/ed/edge-runtime/package.nix +++ b/pkgs/by-name/ed/edge-runtime/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, rustPlatform, nix-update-script, - darwin, openssl, pkg-config, }: @@ -39,16 +38,7 @@ rustPlatform.buildRustPackage { rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreFoundation - SystemConfiguration - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index 673e38d05875..f4f0a50af6e3 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -15,17 +15,10 @@ libGL, SDL2, SDL2_mixer, - darwin, graphicsmagick, }: let - inherit (darwin.apple_sdk.frameworks) - AGL - Cocoa - GLUT - OpenGL - ; wrapper = "eduke32-wrapper"; swWrapper = "voidsw-wrapper"; furyWrapper = "fury-wrapper"; @@ -61,12 +54,6 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib gtk2 libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AGL - Cocoa - GLUT - OpenGL ]; nativeBuildInputs = diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix index d5687cfd4469..99f5cc76ca30 100644 --- a/pkgs/by-name/em/emblem/package.nix +++ b/pkgs/by-name/em/emblem/package.nix @@ -13,7 +13,6 @@ wrapGAppsHook4, libadwaita, libxml2, - darwin, nix-update-script, }: @@ -48,14 +47,10 @@ stdenv.mkDerivation rec { rustc ]; - buildInputs = - [ - libadwaita - libxml2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libadwaita + libxml2 + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index d54fb62c911c..8578b8307378 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -1,18 +1,13 @@ { lib, - stdenv, fetchFromGitHub, installShellFiles, - darwin, gpgme, libgpg-error, pkg-config, rustPlatform, }: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { pname = "envio"; version = "0.6.1"; @@ -35,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgpg-error gpgme - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; postInstall = '' installManPage man/*.1 diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index f365a2c54794..266144cd4808 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -6,11 +6,8 @@ installShellFiles, udev, stdenv, - CoreServices, - Security, nix-update-script, openssl, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -36,11 +33,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration ]; useFetchCargoVendor = true; diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix index 8e60ada716f5..7b21b7297b7c 100644 --- a/pkgs/by-name/es/espup/package.nix +++ b/pkgs/by-name/es/espup/package.nix @@ -9,7 +9,6 @@ xz, zstd, stdenv, - darwin, testers, writableTmpDirAsHomeHook, nix-update-script, @@ -34,18 +33,12 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; - buildInputs = - [ - bzip2 - openssl - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + xz + zstd + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix index 634ecfbbf4d0..d60842ae2133 100644 --- a/pkgs/by-name/et/eternal-terminal/package.nix +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -9,7 +9,6 @@ protobuf, zlib, catch2, - darwin, }: stdenv.mkDerivation rec { diff --git a/pkgs/by-name/ex/exempi/package.nix b/pkgs/by-name/ex/exempi/package.nix index 26b57d89e758..e8131c0d8b57 100644 --- a/pkgs/by-name/ex/exempi/package.nix +++ b/pkgs/by-name/ex/exempi/package.nix @@ -6,7 +6,6 @@ zlib, boost, libiconv, - darwin, }: stdenv.mkDerivation rec { @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.CoreServices ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit; diff --git a/pkgs/by-name/ez/ezno/package.nix b/pkgs/by-name/ez/ezno/package.nix index 9c04adecdb0a..7cf45f25c4b1 100644 --- a/pkgs/by-name/ez/ezno/package.nix +++ b/pkgs/by-name/ez/ezno/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-v4lgHx+sR58CshZJCUYrtaW4EDFBUKFPJJ6V+eyf5Bc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - cargoBuildFlags = [ "--bin" "ezno" diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix index bbb53aabcecf..9419d8a99341 100644 --- a/pkgs/by-name/fa/faircamp/package.nix +++ b/pkgs/by-name/fa/faircamp/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitea, makeWrapper, @@ -10,7 +9,6 @@ vips, ffmpeg, callPackage, - darwin, testers, faircamp, }: @@ -38,15 +36,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - glib - libopus - vips - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + glib + libopus + vips + ]; postInstall = '' wrapProgram $out/bin/faircamp \ diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix index d8126f791aa7..17233dcdcd45 100644 --- a/pkgs/by-name/fh/fh/package.nix +++ b/pkgs/by-name/fh/fh/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, gcc, libcxx, cacert, @@ -32,8 +31,6 @@ rustPlatform.buildRustPackage rec { checkInputs = [ cacert ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration gcc.cc.lib ]; diff --git a/pkgs/by-name/fi/fido2-manage/package.nix b/pkgs/by-name/fi/fido2-manage/package.nix index 633a148451e4..b6440098e92f 100644 --- a/pkgs/by-name/fi/fido2-manage/package.nix +++ b/pkgs/by-name/fi/fido2-manage/package.nix @@ -23,7 +23,6 @@ libuv, libsolv, libcouchbase, - darwin, }: let pythonEnv = python3.withPackages (ps: [ ps.tkinter ]); @@ -69,8 +68,6 @@ stdenv.mkDerivation rec { libuv libsolv libcouchbase - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.PCSC ]; cmakeFlags = [ "-USE_PCSC=ON" ]; diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix index 55a66bb2449d..5a2cbe596878 100644 --- a/pkgs/by-name/fi/filen-cli/package.nix +++ b/pkgs/by-name/fi/filen-cli/package.nix @@ -6,7 +6,6 @@ makeWrapper, nix-update-script, versionCheckHook, - darwin, libsecret, nodejs, perl, @@ -42,12 +41,7 @@ buildNpmPackage (finalAttrs: { ]; # for keytar - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ libsecret ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; postPatch = '' # The version string is substituted during publishing: diff --git a/pkgs/by-name/fi/fim-rs/package.nix b/pkgs/by-name/fi/fim-rs/package.nix index 2ecb4b4142d1..1c43375c7f37 100644 --- a/pkgs/by-name/fi/fim-rs/package.nix +++ b/pkgs/by-name/fi/fim-rs/package.nix @@ -1,11 +1,9 @@ { lib, bzip2, - darwin, fetchFromGitHub, pkg-config, rustPlatform, - stdenv, zstd, }: @@ -32,17 +30,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix index 344844b98588..7df036a80722 100644 --- a/pkgs/by-name/fi/findomain/package.nix +++ b/pkgs/by-name/fi/findomain/package.nix @@ -5,8 +5,6 @@ installShellFiles, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,13 +26,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 0155d14ea793..1bfbe8d0c2a5 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,14 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-FDfsA87VATJ4CpXoJ0eFoFl5z9Jtv6tPjkCf7kz6g00="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - meta = with lib; { description = "Health checks for your Nix flakes"; homepage = "https://github.com/${src.owner}/${src.repo}"; diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index b54936e1a895..8b01aaab4055 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -4,10 +4,8 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, installShellFiles, nix-update-script, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,12 +27,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; env.ASSET_DIR = "target/assets"; diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 882685e3ced5..765ee9f98e55 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -2,7 +2,6 @@ stdenv, lib, overrideSDK, - darwin, fetchFromGitHub, fetchpatch, cmake, diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix index 789f290cd987..653da761f4d6 100644 --- a/pkgs/by-name/fl/fluidsynth/package.nix +++ b/pkgs/by-name/fl/fluidsynth/package.nix @@ -1,6 +1,5 @@ { stdenv, - darwin, lib, fetchFromGitHub, buildPackages, @@ -45,17 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - AudioUnit - CoreAudio - CoreMIDI - CoreServices - ] - ); + ]; cmakeFlags = [ "-Denable-framework=off" diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix index 000dae2e8e34..e77a03029509 100644 --- a/pkgs/by-name/fo/formatjson5/package.nix +++ b/pkgs/by-name/fo/formatjson5/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nix-update-script, fetchpatch, }: @@ -30,8 +28,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-1CSt9dPVHdOqfQXio7/eXiDLWt+iOe6Qj+VtWblwSDE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoBuildFlags = [ "--example formatjson5" ]; postInstall = diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 1469d6233642..94e20e3eee59 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, libiconv, makeBinaryWrapper, installShellFiles, @@ -30,7 +29,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/fr/freealut/package.nix b/pkgs/by-name/fr/freealut/package.nix index ac833b59882f..6ca129b98a5a 100644 --- a/pkgs/by-name/fr/freealut/package.nix +++ b/pkgs/by-name/fr/freealut/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchurl, openal, testers, @@ -18,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openal - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.OpenAL; + ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index ba4ed09bac00..4f12d0298133 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -2,7 +2,6 @@ lib, blueprint-compiler, cargo, - darwin, desktop-file-utils, fetchFromGitHub, glib, @@ -47,15 +46,11 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; - buildInputs = - [ - glib - gtk4 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + gtk4 + libadwaita + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix index b406745ceb3c..06a5af1d65e7 100644 --- a/pkgs/by-name/fu/functiontrace-server/package.nix +++ b/pkgs/by-name/fu/functiontrace-server/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-sPleuZV7eXlQjKqeHCIlRwu1FzneBh460yAElnxi6Do="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; - meta = with lib; { description = "Server for FunctionTrace, a graphical Python profiler"; homepage = "https://functiontrace.com"; diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix index 64b5ae43073b..f3f659bcc5bd 100644 --- a/pkgs/by-name/fu/funzzy/package.nix +++ b/pkgs/by-name/fu/funzzy/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-n9UHyr7W4hrN0+2dsYAYqkP/uzBv74p5XHU0g2MReJY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = with lib; { description = "Lightweight watcher"; homepage = "https://github.com/cristianoliveira/funzzy"; diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 286a7e51dc4f..3f93b15dad98 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -18,7 +18,6 @@ withJACK ? stdenv.hostPlatform.isUnix, libjack2, withGUI ? true, - darwin, portaudio, alsa-lib, # Enable GL/GLES rendering @@ -73,13 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - ] - ); + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_GUI" withGUI) diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix index 5bc5eb315ebd..1c362653909f 100644 --- a/pkgs/by-name/fw/fw/package.nix +++ b/pkgs/by-name/fw/fw/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix index 6d2ffabdb9a7..43fd2d976b75 100644 --- a/pkgs/by-name/fy/fyne/package.nix +++ b/pkgs/by-name/fy/fyne/package.nix @@ -11,8 +11,6 @@ libXrandr, libXxf86vm, pkg-config, - stdenv, - darwin, }: buildGoModule rec { @@ -30,25 +28,15 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libGL - libX11 - libXcursor - libXinerama - libXi - libXrandr - libXxf86vm - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Carbon - Cocoa - Kernel - UserNotifications - ] - )); + buildInputs = [ + libGL + libX11 + libXcursor + libXinerama + libXi + libXrandr + libXxf86vm + ]; doCheck = false; diff --git a/pkgs/by-name/g3/g3proxy/package.nix b/pkgs/by-name/g3/g3proxy/package.nix index f32e62aae86a..b9dcdad4c4e5 100644 --- a/pkgs/by-name/g3/g3proxy/package.nix +++ b/pkgs/by-name/g3/g3proxy/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - darwin, c-ares, python3, lua5_4, @@ -43,14 +41,10 @@ rustPlatform.buildRustPackage rec { cmake ]; - buildInputs = - [ - c-ares - lua5_4 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + c-ares + lua5_4 + ]; meta = { description = "Enterprise-oriented Generic Proxy Solutions"; diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix index 7dedb213faa4..cb3d63379136 100644 --- a/pkgs/by-name/ga/gambit-project/package.nix +++ b/pkgs/by-name/ga/gambit-project/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, wxGTK31, - darwin, withGui ? true, }: @@ -21,9 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxGTK31; - buildInputs = - lib.optional withGui wxGTK31 - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + buildInputs = lib.optional withGui wxGTK31; strictDeps = true; diff --git a/pkgs/by-name/gd/gdlv/package.nix b/pkgs/by-name/gd/gdlv/package.nix index 87858f7a6752..2aeace32b8fe 100644 --- a/pkgs/by-name/gd/gdlv/package.nix +++ b/pkgs/by-name/gd/gdlv/package.nix @@ -1,12 +1,7 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, - AppKit, - CoreGraphics, - Foundation, - Metal, }: buildGoModule rec { pname = "gdlv"; @@ -22,13 +17,6 @@ buildGoModule rec { vendorHash = null; subPackages = "."; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - Foundation - Metal - ]; - meta = with lib; { description = "GUI frontend for Delve"; mainProgram = "gdlv"; diff --git a/pkgs/by-name/gd/gdrive3/package.nix b/pkgs/by-name/gd/gdrive3/package.nix index 07dd3f449d13..dee540bec883 100644 --- a/pkgs/by-name/gd/gdrive3/package.nix +++ b/pkgs/by-name/gd/gdrive3/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-ZIswHJBV1uwrnSm5BmQgb8tVD1XQMTQXQ5DWvBj1WDk="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Google Drive CLI Client"; homepage = "https://github.com/glotlabs/gdrive"; diff --git a/pkgs/by-name/ge/gen-license/package.nix b/pkgs/by-name/ge/gen-license/package.nix index d55dda6ebc21..2a2d292e17fc 100644 --- a/pkgs/by-name/ge/gen-license/package.nix +++ b/pkgs/by-name/ge/gen-license/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-xXzUobB8RMyJOC4lKayE+6SKC7NW1dNWGUUH3i1TaW0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Create licenses for your projects right from your terminal"; mainProgram = "gen-license"; diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix index 53a20c7308a3..0ecba4acd1e0 100644 --- a/pkgs/by-name/ge/gex/package.nix +++ b/pkgs/by-name/ge/gex/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, libgit2, - darwin, nix-update-script, }: @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - buildInputs = - [ - libgit2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/gf/gfxstream/package.nix b/pkgs/by-name/gf/gfxstream/package.nix index ccae47da4d48..48de695bb91f 100644 --- a/pkgs/by-name/gf/gfxstream/package.nix +++ b/pkgs/by-name/gf/gfxstream/package.nix @@ -8,7 +8,6 @@ pkg-config, python3, aemu, - darwin, libdrm, libglvnd, vulkan-headers, @@ -47,23 +46,13 @@ stdenv.mkDerivation { pkg-config python3 ]; - buildInputs = - [ - aemu - libglvnd - vulkan-headers - vulkan-loader - xorg.libX11 - ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.IOSurface - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.QuartzCore - ]; + buildInputs = [ + aemu + libglvnd + vulkan-headers + vulkan-loader + xorg.libX11 + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = toString [ diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index 0da0ca63a6d9..69694f1670ad 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, nix-update-script, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,11 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-kH5YTadpaUXDma+7SfBJxrOIsd9Gm0EU3MfhFmQ3U80="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - # integration tests are not run but the macros need this variable to be set GHC_VERSIONS = ""; checkFlags = "--test \"unit\""; diff --git a/pkgs/by-name/gh/ghostie/package.nix b/pkgs/by-name/gh/ghostie/package.nix index 1737072421f6..8c80579becf7 100644 --- a/pkgs/by-name/gh/ghostie/package.nix +++ b/pkgs/by-name/gh/ghostie/package.nix @@ -6,7 +6,6 @@ openssl, sqlite, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +26,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + openssl + sqlite + ]; # 4 out of 5 tests are notification tests which do not work in nix builds doCheck = false; diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix index e714c2fc7aa6..0c3755f6f425 100644 --- a/pkgs/by-name/gi/gildas/package.nix +++ b/pkgs/by-name/gi/gildas/package.nix @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { patches = [ ./wrapper.patch ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ([ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./clang.patch ./cpp-darwin.patch - ]); + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; diff --git a/pkgs/by-name/gi/gimoji/package.nix b/pkgs/by-name/gi/gimoji/package.nix index ea4c142d369e..d6837ec1452b 100644 --- a/pkgs/by-name/gi/gimoji/package.nix +++ b/pkgs/by-name/gi/gimoji/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-vAhHCNsViYyNSKeSGUL2oIp8bp5UCm8HReyDuoFvfqs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - meta = with lib; { description = "Easily add emojis to your git commit messages"; homepage = "https://github.com/zeenix/gimoji"; diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix index 36092e7bb808..11ef95495dd4 100644 --- a/pkgs/by-name/gi/girouette/package.nix +++ b/pkgs/by-name/gi/girouette/package.nix @@ -5,8 +5,6 @@ pkg-config, dbus, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - dbus - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + dbus + openssl + ]; meta = with lib; { description = "Show the weather in the terminal, in style"; diff --git a/pkgs/by-name/gi/git-agecrypt/package.nix b/pkgs/by-name/gi/git-agecrypt/package.nix index 5136e112ffee..95e48e29d5e6 100644 --- a/pkgs/by-name/gi/git-agecrypt/package.nix +++ b/pkgs/by-name/gi/git-agecrypt/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, libgit2, git, pkg-config, @@ -32,7 +30,7 @@ rustPlatform.buildRustPackage { buildInputs = [ libgit2 zlib - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; meta = with lib; { description = "Alternative to git-crypt using age instead of GPG"; diff --git a/pkgs/by-name/gi/git-chain/package.nix b/pkgs/by-name/gi/git-chain/package.nix index 32bdb30fc5f5..54957d139fbb 100644 --- a/pkgs/by-name/gi/git-chain/package.nix +++ b/pkgs/by-name/gi/git-chain/package.nix @@ -6,8 +6,6 @@ openssl, git, nix-update-script, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -26,14 +24,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - ] - ); + buildInputs = [ openssl ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix index f98afaf57f86..c3190b1517b3 100644 --- a/pkgs/by-name/gi/git-dive/package.nix +++ b/pkgs/by-name/gi/git-dive/package.nix @@ -6,8 +6,6 @@ libgit2, oniguruma, zlib, - stdenv, - darwin, gitMinimal, }: @@ -29,15 +27,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - oniguruma - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + oniguruma + zlib + ]; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index c778dd82857b..2996a06c9853 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -6,7 +6,6 @@ rustPlatform, installShellFiles, libiconv, - darwin, nix-update-script, pkg-config, openssl, @@ -40,8 +39,6 @@ rustPlatform.buildRustPackage { lib.optional stdenv.hostPlatform.isLinux openssl ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration ]; postInstall = lib.optionalString canRunGitGr '' diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix index e8937ae98db9..843b1bc8e51c 100644 --- a/pkgs/by-name/gi/git-igitt/package.nix +++ b/pkgs/by-name/gi/git-igitt/package.nix @@ -6,8 +6,6 @@ libgit2, oniguruma, zlib, - stdenv, - darwin, nix-update-script, }: @@ -34,7 +32,7 @@ rustPlatform.buildRustPackage { libgit2 oniguruma zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix index 992c25b89a3c..a125753eec39 100644 --- a/pkgs/by-name/gi/git-ignore/package.nix +++ b/pkgs/by-name/gi/git-ignore/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - postInstall = '' assets=$releaseDir/../assets installManPage $assets/git-ignore.1 diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index d0ca3b0f5c00..9e7f188964ca 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: let @@ -39,15 +37,11 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix index 8b56b68280a0..e2a04faa8292 100644 --- a/pkgs/by-name/gi/git-together/package.nix +++ b/pkgs/by-name/gi/git-together/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,7 +18,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.Security; + buildInputs = [ openssl ]; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/gi/git-wait/package.nix b/pkgs/by-name/gi/git-wait/package.nix index 8288a70d3c06..f5417c49b36c 100644 --- a/pkgs/by-name/gi/git-wait/package.nix +++ b/pkgs/by-name/gi/git-wait/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, git, }: @@ -22,11 +21,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-tA0WjghBB2K71IlZ1u9K67tZWGe9VNFOfI2YdrqCUw0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=tests::wait_if_index_lock_is_present" ]; diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 83ef36cce08d..8b96afd90687 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -2,10 +2,8 @@ rustPlatform, lib, fetchFromGitHub, - darwin, openssl, pkg-config, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -22,11 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-7qZN198hqAmAd3WH8g+ceSGvQuZ0EheHeMwmvBd9if4="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; meta = with lib; { homepage = "https://github.com/alesbrelih/gitlab-ci-ls"; diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index 925b13b71b61..eb00dfbd7918 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchCrate, iconv, lib, @@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration iconv ]; diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix index 867bc19a9bd8..404aaaaf90fc 100644 --- a/pkgs/by-name/gi/gitnr/package.nix +++ b/pkgs/by-name/gi/gitnr/package.nix @@ -6,7 +6,6 @@ libxkbcommon, openssl, stdenv, - darwin, wayland, }: @@ -32,9 +31,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland diff --git a/pkgs/by-name/gi/gitrs/package.nix b/pkgs/by-name/gi/gitrs/package.nix index d6a3942e7320..9e3de5731e9f 100644 --- a/pkgs/by-name/gi/gitrs/package.nix +++ b/pkgs/by-name/gi/gitrs/package.nix @@ -5,7 +5,6 @@ openssl, pkg-config, libiconv, - darwin, rustPlatform, }: @@ -31,8 +30,6 @@ rustPlatform.buildRustPackage rec { [ openssl.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 240fe153c07f..446fe28374fe 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, git, }: @@ -29,16 +27,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; nativeCheckInputs = [ git diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix index f1db72724190..2f24dbef6752 100644 --- a/pkgs/by-name/gi/gitui/package.nix +++ b/pkgs/by-name/gi/gitui/package.nix @@ -8,7 +8,6 @@ pkg-config, cmake, xclip, - darwin, nix-update-script, }: let @@ -38,8 +37,6 @@ rustPlatform.buildRustPackage { ++ lib.optional stdenv.hostPlatform.isLinux xclip ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.AppKit ]; postPatch = '' diff --git a/pkgs/by-name/gl/gl2ps/package.nix b/pkgs/by-name/gl/gl2ps/package.nix index 6838bccacc0a..f1a5a9746f4f 100644 --- a/pkgs/by-name/gl/gl2ps/package.nix +++ b/pkgs/by-name/gl/gl2ps/package.nix @@ -8,7 +8,6 @@ libGL, libGLU, libglut, - darwin, }: stdenv.mkDerivation rec { @@ -33,9 +32,6 @@ stdenv.mkDerivation rec { libGL libGLU libglut - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL ]; meta = with lib; { diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index f252df75413f..584acabb7ce5 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -31,7 +31,6 @@ tzdata, desktop-file-utils, shared-mime-info, - darwin, makeHardcodeGsettingsPatch, testers, gobject-introspection, @@ -178,18 +177,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux util-linuxMinimal # for libmount - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Carbon - Cocoa - CoreFoundation - CoreServices - Foundation - ] - ); + ]; depsBuildBuild = [ pkg-config # required to find native gi-docgen diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix index 3bb374b47600..e432df1a798d 100644 --- a/pkgs/by-name/gl/glicol-cli/package.nix +++ b/pkgs/by-name/gl/glicol-cli/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pkg-config, stdenv, - darwin, alsa-lib, }: @@ -27,13 +26,9 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; meta = with lib; { description = "Cross-platform music live coding in terminal"; diff --git a/pkgs/by-name/gl/globalplatform/package.nix b/pkgs/by-name/gl/globalplatform/package.nix index 6da23ccfb95d..ed6469b940b0 100644 --- a/pkgs/by-name/gl/globalplatform/package.nix +++ b/pkgs/by-name/gl/globalplatform/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, pcsclite, - PCSC, pkg-config, cmake, zlib, @@ -40,9 +39,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - PCSC ]; cmakeFlags = [ diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix index fc2de8e52d78..b504b09afefd 100644 --- a/pkgs/by-name/gl/glrnvim/package.nix +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,14 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-oE1HXmJbKHegubqhsovat1ce/4rjdKGGTnmDdbRBo/k="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - DiskArbitration - Foundation - ] - ); - postInstall = '' install -Dm644 glrnvim.desktop -t $out/share/applications install -Dm644 glrnvim.svg $out/share/icons/hicolor/scalable/apps/glrnvim.svg diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix index b4d4f268fe15..780905919816 100644 --- a/pkgs/by-name/gm/gmt/package.nix +++ b/pkgs/by-name/gm/gmt/package.nix @@ -48,21 +48,11 @@ stdenv.mkDerivation (finalAttrs: { dcw-gmt gshhg-gmt ] - ++ ( - if stdenv.hostPlatform.isDarwin then - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreGraphics - CoreVideo - ] - else - [ - fftwSinglePrec - blas - lapack - ] - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + fftwSinglePrec + blas + lapack + ]; propagatedBuildInputs = [ ghostscript ]; diff --git a/pkgs/by-name/gn/gn/generic.nix b/pkgs/by-name/gn/gn/generic.nix index 218a46d3fb98..d5327a4683c7 100644 --- a/pkgs/by-name/gn/gn/generic.nix +++ b/pkgs/by-name/gn/gn/generic.nix @@ -1,10 +1,10 @@ { stdenv, lib, + darwin, fetchgit, fetchpatch, cctools, - darwin, writeText, ninja, python3, @@ -54,19 +54,10 @@ stdenv.mkDerivation { ninja python3 ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin; - with apple_sdk.frameworks; - [ - libobjc - cctools - - # frameworks - ApplicationServices - Foundation - AppKit - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libobjc + cctools + ]; env.NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index 5c6035799e8d..734c9a32ce9c 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -4,7 +4,6 @@ buildGoModule, fetchFromGitHub, libobjc, - IOKit, nixosTests, }: @@ -62,7 +61,6 @@ buildGoModule rec { # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - IOKit ]; passthru.tests = { inherit (nixosTests) geth; }; diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix index 12f6e8f38c7e..69bf2531e07e 100644 --- a/pkgs/by-name/go/gobang/package.nix +++ b/pkgs/by-name/go/gobang/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: let version = "0.1.0-alpha.5"; @@ -24,14 +22,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-K9oo0QrqcPNdV7WMlgSCVc+7AVfoyDkovvJLqKJPvTQ="; - buildInputs = - with darwin.apple_sdk.frameworks; - lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - SystemConfiguration - ]; - meta = { description = "Cross-platform TUI database management tool written in Rust"; homepage = "https://github.com/tako8ki/gobang"; diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix index f666cb2f7e5f..33eec234f389 100644 --- a/pkgs/by-name/go/gossip/package.nix +++ b/pkgs/by-name/go/gossip/package.nix @@ -1,6 +1,5 @@ { cmake, - darwin, fetchFromGitHub, SDL2, ffmpeg_6, @@ -66,14 +65,6 @@ rustPlatform.buildRustPackage rec { libxkbcommon openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.ForceFeedback - darwin.apple_sdk.frameworks.AVFoundation - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland libX11 diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 2f128bb06305..a5a56b609a87 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -2,8 +2,6 @@ lib, buildGoModule, fetchFromGitHub, - darwin, - stdenv, }: buildGoModule rec { pname = "gptscript"; @@ -18,8 +16,6 @@ buildGoModule rec { vendorHash = "sha256-ajglXWGJhSJtcrbSBmxmriXFTT+Vb4xYq0Ec9SYRlQk="; - propagatedBuildInputs = with darwin; lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/gr/gridlock/package.nix b/pkgs/by-name/gr/gridlock/package.nix index fc65506c631e..5f609d110b22 100644 --- a/pkgs/by-name/gr/gridlock/package.nix +++ b/pkgs/by-name/gr/gridlock/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -31,13 +29,9 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; postInstall = '' moveToOutput bin/nyarr $nyarr diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix index 5d15310837aa..c58d34f1765c 100644 --- a/pkgs/by-name/gu/gurk-rs/package.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -4,7 +4,6 @@ protobuf, rustPlatform, fetchFromGitHub, - darwin, pkgsBuildHost, openssl, pkg-config, @@ -14,9 +13,6 @@ gurk-rs, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in rustPlatform.buildRustPackage rec { pname = "gurk-rs"; version = "0.6.4"; @@ -41,7 +37,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + buildInputs = [ openssl ]; NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix index d90f793c3a7f..c4c2703b91ce 100644 --- a/pkgs/by-name/ha/halp/package.nix +++ b/pkgs/by-name/ha/halp/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, unixtools, }: @@ -31,10 +30,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - nativeCheckInputs = [ unixtools.script ]; diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix index 46153f48d145..34d05d2acae9 100644 --- a/pkgs/by-name/ha/handbrake/package.nix +++ b/pkgs/by-name/ha/handbrake/package.nix @@ -87,11 +87,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) - AudioToolbox - Foundation - VideoToolbox - ; inherit (darwin) libobjc; version = "1.9.2"; @@ -296,10 +291,7 @@ let ] ++ optional useFdk fdk_aac ++ optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - Foundation libobjc - VideoToolbox ] # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # look at ./make/configure.py search "enable_nvenc" diff --git a/pkgs/by-name/ha/haylxon/package.nix b/pkgs/by-name/ha/haylxon/package.nix index 3d965efa3743..36ee26365a18 100644 --- a/pkgs/by-name/ha/haylxon/package.nix +++ b/pkgs/by-name/ha/haylxon/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,8 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-cKYHC8qz81P4xtehGQIvNH/g/pa90IJQbKz0RM9tjws="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = { description = "Save screenshots of urls and webpages from terminal"; homepage = "https://github.com/pwnwriter/haylxon"; diff --git a/pkgs/by-name/he/health/package.nix b/pkgs/by-name/he/health/package.nix index 5766a60ba94e..76770dabbf9b 100644 --- a/pkgs/by-name/he/health/package.nix +++ b/pkgs/by-name/he/health/package.nix @@ -13,7 +13,6 @@ libadwaita, libsecret, tinysparql, - darwin, nix-update-script, }: @@ -46,16 +45,11 @@ stdenv.mkDerivation rec { blueprint-compiler ]; - buildInputs = - [ - libadwaita - libsecret - tinysparql - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libadwaita + libsecret + tinysparql + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix index f93de6fc5dd9..2a37463e1bc2 100644 --- a/pkgs/by-name/he/hebbot/package.nix +++ b/pkgs/by-name/he/hebbot/package.nix @@ -8,7 +8,6 @@ openssl, autoconf, automake, - darwin, unstableGitUpdater, sqlite, }: @@ -37,14 +36,9 @@ rustPlatform.buildRustPackage rec { automake ]; - buildInputs = - [ - openssl - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; env = { OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix index 52d8badc95fb..11b888c4c59b 100644 --- a/pkgs/by-name/ho/hoard/package.nix +++ b/pkgs/by-name/ho/hoard/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "CLI command organizer written in rust"; diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index f9f55510bfff..9b19565ce446 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -7,7 +7,6 @@ python3, stdenv, cctools, - darwin, lib, nixosTests, enableLocalIcons ? false, @@ -62,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ nodePackages.node-gyp-build - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + ]; env.PYTHON = "${python3}/bin/python"; diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index 9e4cc9f9eec2..bc3ec4f995cc 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -5,7 +5,6 @@ pkg-config, openssl, stdenv, - darwin, coreutils, gnome-keyring, libsecret, @@ -44,10 +43,6 @@ rustPlatform.buildRustPackage { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gnome-keyring - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; postPatch = '' diff --git a/pkgs/by-name/ht/htop-vim/package.nix b/pkgs/by-name/ht/htop-vim/package.nix index 937d212c37eb..b10a23cc8c62 100644 --- a/pkgs/by-name/ht/htop-vim/package.nix +++ b/pkgs/by-name/ht/htop-vim/package.nix @@ -6,7 +6,6 @@ autoreconfHook, pkg-config, ncurses, - darwin, libcap, libnl, sensorsSupport ? stdenv.hostPlatform.isLinux, @@ -53,7 +52,6 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.IOKit ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnl diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix index 391b4f400bc9..695d17726b38 100644 --- a/pkgs/by-name/ht/httplz/package.nix +++ b/pkgs/by-name/ht/httplz/package.nix @@ -7,8 +7,6 @@ pkg-config, ronn, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -31,11 +29,7 @@ rustPlatform.buildRustPackage rec { ronn ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix index 0f171a6b81e6..e7467882d85d 100644 --- a/pkgs/by-name/hy/hydra-cli/package.nix +++ b/pkgs/by-name/hy/hydra-cli/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, testers, hydra-cli, }: @@ -30,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ic/icon-library/package.nix b/pkgs/by-name/ic/icon-library/package.nix index 7c3185aedc87..bee499147760 100644 --- a/pkgs/by-name/ic/icon-library/package.nix +++ b/pkgs/by-name/ic/icon-library/package.nix @@ -16,7 +16,6 @@ gtk4, gtksourceview5, libadwaita, - darwin, }: stdenv.mkDerivation rec { @@ -45,17 +44,13 @@ stdenv.mkDerivation rec { rustc wrapGAppsHook4 ]; - buildInputs = - [ - gdk-pixbuf - glib - gtk4 - gtksourceview5 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + gdk-pixbuf + glib + gtk4 + gtksourceview5 + libadwaita + ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/icon-library"; diff --git a/pkgs/by-name/id/idutils/package.nix b/pkgs/by-name/id/idutils/package.nix index f7640baffc8d..fd6e2b8fdc84 100644 --- a/pkgs/by-name/id/idutils/package.nix +++ b/pkgs/by-name/id/idutils/package.nix @@ -12,7 +12,6 @@ texinfo, perl, rsync, - darwin, }: stdenv.mkDerivation rec { @@ -31,13 +30,9 @@ stdenv.mkDerivation rec { ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - emacs - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + emacs + ]; nativeBuildInputs = [ gnulib diff --git a/pkgs/by-name/im/implot/demos/default.nix b/pkgs/by-name/im/implot/demos/default.nix index 00bd02f69ed4..45d5d54ac83a 100644 --- a/pkgs/by-name/im/implot/demos/default.nix +++ b/pkgs/by-name/im/implot/demos/default.nix @@ -5,7 +5,6 @@ fetchpatch, cmake, pkg-config, - darwin, fmt, gtk3, iir1, @@ -54,18 +53,15 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = - [ - curl - fmt - iir1 - imgui - imnodes - implot - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = [ + curl + fmt + iir1 + imgui + imnodes + implot + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]; meta = { description = "Standalone ImPlot Demos"; diff --git a/pkgs/by-name/im/imtui/package.nix b/pkgs/by-name/im/imtui/package.nix index 4bb5187ab518..a587f8bce7ab 100644 --- a/pkgs/by-name/im/imtui/package.nix +++ b/pkgs/by-name/im/imtui/package.nix @@ -12,7 +12,6 @@ withNcurses ? (!withEmscripten), ncurses, static ? withEmscripten, - darwin, }: stdenv.mkDerivation rec { @@ -34,8 +33,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withEmscripten emscripten ++ lib.optional withCurl curl - ++ lib.optional withNcurses ncurses - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional withNcurses ncurses; postPatch = '' diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix index e2fec783cb76..79cf30615328 100644 --- a/pkgs/by-name/in/intelli-shell/package.nix +++ b/pkgs/by-name/in/intelli-shell/package.nix @@ -7,8 +7,6 @@ openssl, sqlite, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,16 +27,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - sqlite - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + sqlite + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index 01138c9e3517..8906373f993c 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,14 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-O/j+/sRyMtqd4GaER2trn9SEFpZuSlc5q1MTXU+rwLg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - # Some tests require network access which is not available in nix build sandbox. doCheck = false; diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 13f0949c976c..99326fed642d 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -6,7 +6,6 @@ libGL, libheif, libjpeg, - darwin, pkg-config, stdenv, enableHEIFCodec ? true, @@ -50,9 +49,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableOpenGL [ libglut libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa ]; # Since "build" already exists and is populated, cmake tries to use it, diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index 818724a409bb..aac9207c2697 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchCrate, fetchpatch, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,10 +25,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Simple CLI generation tool for creating large datasets"; mainProgram = "jen"; diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix index 0be61315c429..524666c29dcb 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -11,18 +11,9 @@ libXi, libXtst, zlib, - darwin, electron, }: -let - inherit (darwin.apple_sdk.frameworks) - Carbon - CoreFoundation - ApplicationServices - OpenGL - ; -in buildNpmPackage rec { pname = "jitsi-meet-electron"; version = "2025.2.0"; @@ -43,20 +34,13 @@ buildNpmPackage rec { ]; # robotjs node-gyp dependencies - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libpng - libX11 - libXi - libXtst - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreFoundation - ApplicationServices - OpenGL - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libpng + libX11 + libXi + libXtst + zlib + ]; npmDepsHash = "sha256-TckV91RJo06OKb8nIvxBCxu28qyHtA/ACDshOlaCQxA="; diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix index cfb33fa796bb..a2544073b83c 100644 --- a/pkgs/by-name/jo/josh/package.nix +++ b/pkgs/by-name/jo/josh/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, libgit2, @@ -8,7 +7,6 @@ pkg-config, makeWrapper, git, - darwin, }: let @@ -40,14 +38,10 @@ rustPlatform.buildRustPackage { makeWrapper ]; - buildInputs = - [ - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Security - ]; + buildInputs = [ + libgit2 + openssl + ]; cargoBuildFlags = cargoFlags; cargoTestFlags = cargoFlags; diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix index fb923caea595..72e1c48a3d94 100644 --- a/pkgs/by-name/jo/joshuto/package.nix +++ b/pkgs/by-name/jo/joshuto/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd joshuto \ --bash <($out/bin/joshuto completions bash) \ diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix index a3839536694b..5c2ac20a8e82 100644 --- a/pkgs/by-name/ju/jumpy/package.nix +++ b/pkgs/by-name/ju/jumpy/package.nix @@ -12,7 +12,6 @@ vulkan-loader, wayland, xorg, - darwin, }: rustPlatform.buildRustPackage rec { @@ -50,7 +49,6 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 80e0c4b31c74..bbbe29f0fd80 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -4,10 +4,6 @@ fetchFromGitHub, replaceVars, perl, - stdenv, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -26,12 +22,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-fb6RDcOLtkrUqw+BX2oa43d84BGF8IA2HxhdGgB94iU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; - meta = { description = "Kakoune Language Server Protocol Client"; homepage = "https://github.com/kakoune-lsp/kakoune-lsp"; diff --git a/pkgs/by-name/ka/kana/package.nix b/pkgs/by-name/ka/kana/package.nix index ba8cf79ef86a..fc4d2aa1b860 100644 --- a/pkgs/by-name/ka/kana/package.nix +++ b/pkgs/by-name/ka/kana/package.nix @@ -12,7 +12,6 @@ desktop-file-utils, libadwaita, gst_all_1, - darwin, }: stdenv.mkDerivation rec { @@ -53,10 +52,7 @@ stdenv.mkDerivation rec { gst-plugins-base gst-plugins-bad gst-plugins-good - ]) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + ]); # Workaround for the gettext-sys issue # https://github.com/Koka/gettext-rs/issues/114 diff --git a/pkgs/by-name/ka/kanha/package.nix b/pkgs/by-name/ka/kanha/package.nix index 1e42a8430dd8..1395e113ac21 100644 --- a/pkgs/by-name/ka/kanha/package.nix +++ b/pkgs/by-name/ka/kanha/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, openssl, }: @@ -20,16 +18,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-bO37UYApe1CbwcfG8j/1UPu6DlYqlGPLsh0epxh8x3M="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreFoundation - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; meta = { description = "Web-app pentesting suite written in rust"; diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix index d100621bff69..08b1503ea263 100644 --- a/pkgs/by-name/kb/kbt/package.nix +++ b/pkgs/by-name/kb/kbt/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, pkg-config, - darwin, xorg, }: @@ -26,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libX11 + ]; meta = with lib; { description = "Keyboard tester in terminal"; diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 2a4abe1194ce..7df5288488e1 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -1,6 +1,5 @@ { buildGoModule, - darwin, fetchFromGitHub, installShellFiles, kclvm_cli, @@ -34,16 +33,10 @@ buildGoModule rec { installShellFiles ]; - buildInputs = - [ - kclvm - kclvm_cli - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]); + buildInputs = [ + kclvm + kclvm_cli + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' export HOME=$(mktemp -d) diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index 7c33e7e0b9eb..94eb2b4bf18d 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, protobuf, pkg-config, - darwin, rustc, }: rustPlatform.buildRustPackage rec { @@ -24,13 +23,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-o7YFyqRWAMjq23mcAqDrcN4infdBgp1KNvviYOLR35s="; - buildInputs = - [ rustc ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ rustc ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libkclvm_cli_cdylib.dylib $out/lib/libkclvm_cli_cdylib.dylib diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index 4d350cebdf48..b205e1484df0 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, kclvm, - darwin, rustc, }: rustPlatform.buildRustPackage rec { @@ -23,16 +21,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZhrjxHqwWwcVkCVkJJnVm2CZLfRlrI2383ejgI+B2KQ="; cargoPatches = [ ./cargo_lock.patch ]; - buildInputs = - [ - kclvm - rustc - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]); + buildInputs = [ + kclvm + rustc + ]; meta = with lib; { description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; diff --git a/pkgs/by-name/ke/kepler/package.nix b/pkgs/by-name/ke/kepler/package.nix index 845e6fff4ce3..ebdadf611ed2 100644 --- a/pkgs/by-name/ke/kepler/package.nix +++ b/pkgs/by-name/ke/kepler/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, libpq, openssl, @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - libpq - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libpq + openssl + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index cf8920486320..f1ccf11f0250 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -28,11 +28,6 @@ installShellFiles, dbus, sudo, - Libsystem, - Cocoa, - Kernel, - UniformTypeIdentifiers, - UserNotifications, libcanberra, libicns, wayland-scanner, @@ -85,17 +80,10 @@ buildPythonApplication rec { xxHash ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - Kernel - UniformTypeIdentifiers - UserNotifications libpng python3 zlib ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - Libsystem - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fontconfig libunistring diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 84abcc2a04bd..70824ce6352c 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -5,7 +5,6 @@ pkg-config, openssl, rustPlatform, - darwin, testers, komac, dbus, @@ -37,17 +36,12 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; - buildInputs = - [ - dbus - openssl - zstd - bzip2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + dbus + openssl + zstd + bzip2 + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix index d1b830abf4aa..b25304679cbf 100644 --- a/pkgs/by-name/ko/kord/package.nix +++ b/pkgs/by-name/ko/kord/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchFromGitHub, fetchpatch, rustPlatform, @@ -41,9 +40,7 @@ rustPlatform.buildRustPackage rec { lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; meta = with lib; { description = "Music theory binary and library for Rust"; diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix index cd197e43bec0..0c1516e33c71 100644 --- a/pkgs/by-name/kt/kty/package.nix +++ b/pkgs/by-name/kt/kty/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,16 +25,9 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; }; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; - [ - frameworks.SystemConfiguration - ] - ); + buildInputs = [ + openssl + ]; useFetchCargoVendor = true; cargoHash = "sha256-nJ+nof2YhyLrNuLVy69kYj5tw+aG4IJm6nVxHkczbko="; diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index 16d3029eccd8..d271b1c88329 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -2,8 +2,6 @@ rustPlatform, lib, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,13 +19,6 @@ rustPlatform.buildRustPackage rec { "--skip=workers::kube::store::tests::kubeconfigからstateを生成" ]; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) ( - with darwin.apple_sdk; - [ - frameworks.CoreGraphics - frameworks.AppKit - ] - ); useFetchCargoVendor = true; cargoHash = "sha256-fMrlZMe2uD+ImM6zPXzo/+/Eto2MeIyscYfU8msLJFw="; diff --git a/pkgs/by-name/la/lazymc/package.nix b/pkgs/by-name/la/lazymc/package.nix index d598a4ca7c07..85ef9ddf9806 100644 --- a/pkgs/by-name/la/lazymc/package.nix +++ b/pkgs/by-name/la/lazymc/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nix-update-script, }: @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-jqqqWZKO1HgwxLBGMz9rlFQ5xmZTycfUZjqHf+uVTBQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 9ca3eb727e77..82dabbcd3fff 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -26,9 +26,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; passthru.tests.version = testers.testVersion { package = lazysql; diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index 95b6ffa898a0..03f87a50d91c 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -16,7 +16,6 @@ lit, gdb, unzip, - darwin, ldcBootstrap ? callPackage ./bootstrap.nix { }, }: @@ -77,9 +76,6 @@ stdenv.mkDerivation (finalAttrs: { ninja unzip ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix index 31cac3531b68..12181d2036ac 100644 --- a/pkgs/by-name/le/leaf/package.nix +++ b/pkgs/by-name/le/leaf/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-RQ9fQfYfpsFAA5CzR3ICLIEYb00qzUsWAQKSrK/488g="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - meta = with lib; { description = "Simple system fetch written in rust"; homepage = "https://github.com/IogaMaster/leaf"; diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix index 25f05d80fb52..df6619838059 100644 --- a/pkgs/by-name/le/leetcode-cli/package.nix +++ b/pkgs/by-name/le/leetcode-cli/package.nix @@ -8,7 +8,6 @@ dbus, sqlite, stdenv, - darwin, testers, leetcode-cli, }: @@ -30,16 +29,11 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - openssl - dbus - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + dbus + sqlite + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd leetcode \ diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix index 99e1862dd5f9..f6802c334951 100644 --- a/pkgs/by-name/le/legba/package.nix +++ b/pkgs/by-name/le/legba/package.nix @@ -6,8 +6,6 @@ pkg-config, openssl, samba, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,14 +26,10 @@ rustPlatform.buildRustPackage rec { cmake pkg-config ]; - buildInputs = - [ - openssl.dev - samba - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl.dev + samba + ]; # Paho C test fails due to permission issue doCheck = false; diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix index 4a7fbb5409db..5b01f4f6aef6 100644 --- a/pkgs/by-name/le/lenmus/package.nix +++ b/pkgs/by-name/le/lenmus/package.nix @@ -16,14 +16,10 @@ wxsqlite3, fluidsynth, fontconfig, - darwin, soundfont-fluid, openlilylib-fonts, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation (finalAttrs: { pname = "lenmus"; version = "6.0.1"; @@ -54,23 +50,19 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; - buildInputs = - [ - boost - portmidi - sqlite - freetype - libpng - pngpp - zlib - wxGTK32 - wxsqlite3 - fluidsynth - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + boost + portmidi + sqlite + freetype + libpng + pngpp + zlib + wxGTK32 + wxsqlite3 + fluidsynth + fontconfig + ]; preConfigure = '' mkdir res/fonts diff --git a/pkgs/by-name/li/libaribcaption/package.nix b/pkgs/by-name/li/libaribcaption/package.nix index 353f31c0e128..51d1da2f66be 100644 --- a/pkgs/by-name/li/libaribcaption/package.nix +++ b/pkgs/by-name/li/libaribcaption/package.nix @@ -7,10 +7,6 @@ fontconfig, freetype, - ApplicationServices, - CoreFoundation, - CoreGraphics, - CoreText, }: stdenv.mkDerivation rec { @@ -28,17 +24,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ - fontconfig - freetype - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - CoreFoundation - CoreGraphics - CoreText - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + fontconfig + freetype + ]; meta = with lib; { description = "Portable ARIB STD-B24 Caption Decoder/Renderer"; diff --git a/pkgs/by-name/li/libass/package.nix b/pkgs/by-name/li/libass/package.nix index ba3fa9a74633..68a443b16e66 100644 --- a/pkgs/by-name/li/libass/package.nix +++ b/pkgs/by-name/li/libass/package.nix @@ -11,7 +11,6 @@ fontconfig ? null, # fontconfig support largeTilesSupport ? false, # Use larger tiles in the rasterizer libiconv, - darwin, }: assert fontconfigSupport -> fontconfig != null; @@ -49,9 +48,6 @@ stdenv.mkDerivation rec { ++ lib.optional fontconfigSupport fontconfig ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.ApplicationServices - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreText ]; meta = with lib; { diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix index e0eb69704199..122cbb651ab9 100644 --- a/pkgs/by-name/li/libclipboard/package.nix +++ b/pkgs/by-name/li/libclipboard/package.nix @@ -6,7 +6,6 @@ libxcb, libXau, libXdmcp, - darwin, lib, }: @@ -25,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb libXau libXdmcp - ] ++ lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ]; nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index c8e922edf339..e4bde0ff3063 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -15,7 +15,6 @@ sqlcipher, sqlite, fixDarwinDylibNames, - darwin, libiconv, }: @@ -59,9 +58,6 @@ stdenv.mkDerivation rec { sqlite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/pkgs/by-name/li/libdiscid/package.nix b/pkgs/by-name/li/libdiscid/package.nix index e863863fe6f1..3be92789614b 100644 --- a/pkgs/by-name/li/libdiscid/package.nix +++ b/pkgs/by-name/li/libdiscid/package.nix @@ -4,7 +4,6 @@ fetchurl, cmake, pkg-config, - darwin, }: stdenv.mkDerivation rec { @@ -16,8 +15,6 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; - src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI="; diff --git a/pkgs/by-name/li/libfreefare/package.nix b/pkgs/by-name/li/libfreefare/package.nix index 8aa06f577a95..b56a5b107a49 100644 --- a/pkgs/by-name/li/libfreefare/package.nix +++ b/pkgs/by-name/li/libfreefare/package.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc - darwin.apple_sdk ]; env = { diff --git a/pkgs/by-name/li/libhv/package.nix b/pkgs/by-name/li/libhv/package.nix index 4eb104dbce54..c7fabd5eb5c6 100644 --- a/pkgs/by-name/li/libhv/package.nix +++ b/pkgs/by-name/li/libhv/package.nix @@ -5,7 +5,6 @@ cmake, curl, openssl, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; cmakeFlags = [ "-DENABLE_UDS=ON" diff --git a/pkgs/by-name/li/libproxy/package.nix b/pkgs/by-name/li/libproxy/package.nix index 67ccc456dc74..191a7d484d69 100644 --- a/pkgs/by-name/li/libproxy/package.nix +++ b/pkgs/by-name/li/libproxy/package.nix @@ -2,7 +2,6 @@ lib, _experimental-update-script-combinators, curl, - darwin, duktape, fetchFromGitHub, gi-docgen, @@ -88,17 +87,10 @@ stdenv.mkDerivation (finalAttrs: { curl duktape ] - ++ ( - if stdenv.hostPlatform.isDarwin then - (with darwin.apple_sdk.frameworks; [ - Foundation - ]) - else - [ - glib - gsettings-desktop-schemas - ] - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + glib + gsettings-desktop-schemas + ]; mesonFlags = [ diff --git a/pkgs/by-name/li/libremidi/package.nix b/pkgs/by-name/li/libremidi/package.nix index a5a16f53e338..4490619f1f71 100644 --- a/pkgs/by-name/li/libremidi/package.nix +++ b/pkgs/by-name/li/libremidi/package.nix @@ -2,19 +2,10 @@ lib, alsa-lib, cmake, - darwin, fetchFromGitHub, stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) - CoreAudio - CoreFoundation - CoreMIDI - CoreServices - ; -in stdenv.mkDerivation (finalAttrs: { pname = "libremidi"; version = "4.5.0"; @@ -30,16 +21,9 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - CoreFoundation - CoreMIDI - CoreServices - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; # Bug: set this as true breaks obs-studio-plugins.advanced-scene-switcher strictDeps = false; diff --git a/pkgs/by-name/li/libserialport/package.nix b/pkgs/by-name/li/libserialport/package.nix index 084b9c812648..db6bdd650e7c 100644 --- a/pkgs/by-name/li/libserialport/package.nix +++ b/pkgs/by-name/li/libserialport/package.nix @@ -4,7 +4,6 @@ fetchurl, pkg-config, udev, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -17,9 +16,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev; meta = { description = "Cross-platform shared library for serial port access"; diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index 9d3f621b9215..b2b6a154ecff 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -7,7 +7,6 @@ xcodebuild, protobuf, boringssl, - darwin, }: let # boring-sys expects the static libraries in build/ instead of lib/ @@ -32,8 +31,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-s7vTzAOWKvGCkrWcxDcKptsmxvW5VxrF5X9Vfkjj1jA="; }; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeBuildInputs = [ protobuf rustPlatform.bindgenHook diff --git a/pkgs/by-name/li/libtiger/package.nix b/pkgs/by-name/li/libtiger/package.nix index 09211b89c89b..3a1d5b6d13fc 100644 --- a/pkgs/by-name/li/libtiger/package.nix +++ b/pkgs/by-name/li/libtiger/package.nix @@ -7,7 +7,6 @@ libkate, pango, cairo, - darwin, }: stdenv.mkDerivation rec { @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { libkate pango cairo - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; + ]; meta = { homepage = "https://code.google.com/archive/p/libtiger/"; diff --git a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix index 9d3c64255893..3521249a6766 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix @@ -10,7 +10,6 @@ python311, libiconv, ncurses, - darwin, boost-build, }: @@ -63,7 +62,7 @@ stdenv.mkDerivation { python311 libiconv ncurses - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; preAutoreconf = '' mkdir -p build-aux diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index b544b1c6f77e..2c7c53c46353 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -8,7 +8,6 @@ openssl, python3, ncurses, - darwin, }: let @@ -41,7 +40,7 @@ stdenv.mkDerivation { zlib python3 ncurses - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; patches = [ # provide distutils alternative for python 3.12 diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix index 94977b420556..1f9562942c1c 100644 --- a/pkgs/by-name/li/libui-ng/package.nix +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -37,10 +37,6 @@ stdenv.mkDerivation { if stdenv.hostPlatform.isDarwin then [ darwin.libobjc - darwin.apple_sdk_11_0.Libsystem - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.AppKit - darwin.apple_sdk_11_0.frameworks.CoreFoundation ] else [ diff --git a/pkgs/by-name/li/libusbsio/package.nix b/pkgs/by-name/li/libusbsio/package.nix index 24a41781d447..d1b762b4e014 100644 --- a/pkgs/by-name/li/libusbsio/package.nix +++ b/pkgs/by-name/li/libusbsio/package.nix @@ -6,7 +6,6 @@ fixDarwinDylibNames, libusb1, systemdMinimal, - darwin, }: stdenv.mkDerivation rec { @@ -39,14 +38,7 @@ stdenv.mkDerivation rec { [ libusb1 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreFoundation - IOKit - ] - ) + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemdMinimal # libudev ]; diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index a5a4ac228048..01d404151dbb 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -1,13 +1,11 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, git, gitls, - darwin, }: rustPlatform.buildRustPackage rec { pname = "licensure"; @@ -23,15 +21,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-b3Vb8beULbLQuBORcE5nWuHkqDmalexJick9Ct5+iUM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - git - gitls - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + git + gitls + ]; checkFlags = [ # Checking for files in the git repo (git ls-files), diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 66ede7d221c3..0257a426b04f 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, openssl, pkg-config, }: @@ -24,15 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; meta = with lib; { description = "Local network server with live reload feature for static pages"; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 40f2b035f152..ee9c8d85f47e 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -2,7 +2,6 @@ lib, autoAddDriverRunpath, cmake, - darwin, fetchFromGitHub, nix-update-script, stdenv, @@ -50,15 +49,6 @@ let optionalString ; - darwinBuildInputs = - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreVideo - CoreGraphics - ] - ++ optionals metalSupport [ MetalKit ]; - cudaBuildInputs = with cudaPackages; [ cuda_cccl # @@ -126,8 +116,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ]; buildInputs = - optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs - ++ optionals cudaSupport cudaBuildInputs + optionals cudaSupport cudaBuildInputs ++ optionals openclSupport [ clblast ] ++ optionals rocmSupport rocmBuildInputs ++ optionals blasSupport [ blas ] diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix index 686831fd92dc..12d0e5d54c90 100644 --- a/pkgs/by-name/ll/llpp/package.nix +++ b/pkgs/by-name/ll/llpp/package.nix @@ -20,7 +20,6 @@ xclip, inotify-tools, procps, - darwin, }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; @@ -63,10 +62,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.Cocoa ]; dontStrip = true; diff --git a/pkgs/by-name/lo/loudmouth/package.nix b/pkgs/by-name/lo/loudmouth/package.nix index 600082edef21..6ce497ea5a59 100644 --- a/pkgs/by-name/lo/loudmouth/package.nix +++ b/pkgs/by-name/lo/loudmouth/package.nix @@ -7,7 +7,6 @@ glib, pkg-config, zlib, - darwin, }: stdenv.mkDerivation rec { @@ -30,14 +29,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals - (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") - [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Foundation - ]; - meta = with lib; { description = "Lightweight C library for the Jabber protocol"; platforms = platforms.all; diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix index 8ff50bc7d6b3..c5f21c02f946 100644 --- a/pkgs/by-name/lo/lowfi/package.nix +++ b/pkgs/by-name/lo/lowfi/package.nix @@ -5,7 +5,6 @@ pkg-config, openssl, stdenv, - darwin, alsa-lib, }: diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index 1bf3282df317..12c94f8cce5f 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -13,7 +13,6 @@ copyDesktopItems, makeDesktopItem, alsa-lib, - darwin, nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -75,10 +74,6 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ webkitgtk_4_1 alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreAudio - darwin.apple_sdk.frameworks.WebKit ]; # Disable checkPhase, since the project doesn't contain tests diff --git a/pkgs/by-name/ls/lsp-ai/package.nix b/pkgs/by-name/ls/lsp-ai/package.nix index 5324d1e13240..9c19652d5323 100644 --- a/pkgs/by-name/ls/lsp-ai/package.nix +++ b/pkgs/by-name/ls/lsp-ai/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, pkg-config, cmake, openssl, @@ -58,15 +56,10 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + openssl + zlib + ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index ee275ba8ad1b..ba6f24bbf5bf 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -31,7 +31,6 @@ libiconv, ninja, prometheus-cpp, - darwin, buildClient ? true, buildServer ? true, SDL2, @@ -109,11 +108,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.OpenAL - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Kernel ] ++ lib.optionals buildClient [ libpng diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix index ac508ee88afc..126041146bd0 100644 --- a/pkgs/by-name/lu/lunatic/package.nix +++ b/pkgs/by-name/lu/lunatic/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; checkFlags = [ # requires simd support which is not always available on hydra diff --git a/pkgs/by-name/m1/m1ddc/package.nix b/pkgs/by-name/m1/m1ddc/package.nix index cd69a7072e3b..51a2113fa17a 100644 --- a/pkgs/by-name/m1/m1ddc/package.nix +++ b/pkgs/by-name/m1/m1ddc/package.nix @@ -1,6 +1,5 @@ { stdenv, - darwin, fetchFromGitHub, lib, }: @@ -21,11 +20,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail kIOMainPortDefault kIOMasterPortDefault ''; - buildInputs = with darwin.apple_sdk_11_0.frameworks; [ - CoreDisplay - Foundation - ]; - installPhase = '' runHook preInstall mkdir -p $out/bin diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index bf74f70ffd5a..f8e2a2c382a4 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -7,7 +7,6 @@ makeWrapper, pkg-config, openssl, - darwin, maa-assistant-arknights, android-tools, git, @@ -30,15 +29,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; # https://github.com/MaaAssistantArknights/maa-cli/pull/126 buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix index bf3e0b657d72..03d34ca4257f 100644 --- a/pkgs/by-name/ma/macchina/package.nix +++ b/pkgs/by-name/ma/macchina/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,11 +23,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.DisplayServices - ]; - postInstall = '' installManPage doc/macchina.{1,7} ''; diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix index baabb4624d87..5155985b1f98 100644 --- a/pkgs/by-name/ma/markuplinkchecker/package.nix +++ b/pkgs/by-name/ma/markuplinkchecker/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: let version = "0.21.0"; @@ -26,15 +24,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index b88b92d78f90..ad5639754927 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -10,7 +10,6 @@ sqlite, zstd, stdenv, - darwin, open-policy-agent, cctools, }: @@ -46,16 +45,10 @@ rustPlatform.buildRustPackage rec { (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; # libtool used by gyp; - buildInputs = - [ - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix index 1248862513b4..b5782bd57d1b 100644 --- a/pkgs/by-name/ma/matrix-commander-rs/package.nix +++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, openssl, pkg-config, @@ -28,12 +26,7 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; meta = { description = "CLI-based Matrix client app for sending and receiving"; diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix index 6dcea572c57f..16d1ad758aa3 100644 --- a/pkgs/by-name/ma/matrix-conduit/package.nix +++ b/pkgs/by-name/ma/matrix-conduit/package.nix @@ -5,7 +5,6 @@ pkg-config, sqlite, stdenv, - darwin, nixosTests, rocksdb, rust-jemalloc-sys, @@ -36,15 +35,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - sqlite - rust-jemalloc-sys - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + rust-jemalloc-sys + ]; env = { ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index d1dd4024fec7..c9f694e68cf9 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, rustPlatform, fetchpatch, - darwin, libiconv, testers, nix-update-script, @@ -37,7 +36,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/by-name/mc/mchprs/package.nix b/pkgs/by-name/mc/mchprs/package.nix index c3a38d74b0cd..d562355d6c00 100644 --- a/pkgs/by-name/mc/mchprs/package.nix +++ b/pkgs/by-name/mc/mchprs/package.nix @@ -6,8 +6,6 @@ openssl, sqlite, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,17 +27,11 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - openssl - sqlite - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + sqlite + zlib + ]; meta = with lib; { mainProgram = "mchprs"; diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix index 21b12fc2501b..a69f81120099 100644 --- a/pkgs/by-name/mc/mcumgr-client/package.nix +++ b/pkgs/by-name/mc/mcumgr-client/package.nix @@ -6,7 +6,6 @@ pkg-config, udev, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,9 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev ]; meta = with lib; { description = "Client for mcumgr commands"; diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index 5956ad70637a..abbb890aa74a 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - darwin, nix-update-script, }: @@ -24,12 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 2a0d2922dfa0..f1a888e02180 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,11 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-emfO7D7JU/fQYdnaK7eWR8tCPx3ffvU/pTutSURZMBQ="; doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = with lib; { description = "D2 diagram generator plugin for MdBook"; mainProgram = "mdbook-d2"; diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix index 430e3f32f30a..5de989c1176a 100644 --- a/pkgs/by-name/md/mdbook-emojicodes/package.nix +++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-+VVkrXvsqtizeVhfuO0U8ADfSkmovpT7DVwrz7QljU0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; - meta = with lib; { description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱"; mainProgram = "mdbook-emojicodes"; diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix index fd18fe07fc96..a97b80644f49 100644 --- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix +++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Render Kroki diagrams from files or code blocks in mdbook"; diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 2840a37eb50b..57ad9750434f 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, nix, rustPlatform, - darwin, - CoreServices ? darwin.apple_sdk.frameworks.CoreServices, installShellFiles, }: let @@ -27,8 +25,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd mdbook \ --bash <($out/bin/mdbook completions bash) \ diff --git a/pkgs/by-name/me/metronome/package.nix b/pkgs/by-name/me/metronome/package.nix index c2010ce3a10b..b9f4dee6a2ee 100644 --- a/pkgs/by-name/me/metronome/package.nix +++ b/pkgs/by-name/me/metronome/package.nix @@ -12,7 +12,6 @@ desktop-file-utils, libadwaita, gst_all_1, - darwin, }: stdenv.mkDerivation rec { @@ -44,16 +43,12 @@ stdenv.mkDerivation rec { desktop-file-utils ]; - buildInputs = - [ - libadwaita - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-bad - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libadwaita + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + ]; # Workaround for the gettext-sys issue # https://github.com/Koka/gettext-rs/issues/114 diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix index 2f5d08158f94..dc44e039ccd7 100644 --- a/pkgs/by-name/mi/microbin/package.nix +++ b/pkgs/by-name/mi/microbin/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, fetchpatch, lib, @@ -7,7 +6,6 @@ openssl, pkg-config, rustPlatform, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -66,14 +64,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - oniguruma - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + oniguruma + openssl + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/mi/microserver/package.nix b/pkgs/by-name/mi/microserver/package.nix index 84f46fd49e25..af9f172fa69c 100644 --- a/pkgs/by-name/mi/microserver/package.nix +++ b/pkgs/by-name/mi/microserver/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-IPJJ9kv7gf5l7Y2JLCLjkNFao42h/VmkTd3LF5BCMLU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ Security ] - ); - meta = with lib; { homepage = "https://github.com/robertohuertasm/microserver"; description = "Simple ad-hoc server with SPA support"; diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index d85fd90783b0..36b2f3f5e609 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, curl, }: @@ -26,11 +25,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - nativeCheckInputs = [ curl ]; diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 7e1498c91c1d..d13d828977ef 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, coreutils, bash, direnv, @@ -12,8 +11,6 @@ pkg-config, openssl, cacert, - Security, - SystemConfiguration, usage, mise, testers, @@ -40,12 +37,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; postPatch = '' patchShebangs --build \ diff --git a/pkgs/by-name/mk/mkalias/package.nix b/pkgs/by-name/mk/mkalias/package.nix index 38f326992f67..a9c57605e1de 100644 --- a/pkgs/by-name/mk/mkalias/package.nix +++ b/pkgs/by-name/mk/mkalias/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -21,10 +20,6 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = [ - darwin.apple_sdk.frameworks.Foundation - ]; - cmakeFlags = [ "-DMKALIAS_VERSION=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix index aede71ab8bc2..1f3b5add9fed 100644 --- a/pkgs/by-name/mo/mollysocket/package.nix +++ b/pkgs/by-name/mo/mollysocket/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, sqlite, - stdenv, - darwin, nixosTests, }: @@ -28,14 +26,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + sqlite + ]; checkFlags = [ # tests interact with Signal servers diff --git a/pkgs/by-name/mo/monit/package.nix b/pkgs/by-name/mo/monit/package.nix index b0f3cfbba160..f46b42511b9e 100644 --- a/pkgs/by-name/mo/monit/package.nix +++ b/pkgs/by-name/mo/monit/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, bison, flex, zlib, @@ -22,15 +21,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-l2DDqihhH8FDhmZUCs4A1XKk8pdCo6VG1lYodEr19HQ="; }; - nativeBuildInputs = - [ - bison - flex - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.DiskArbitration - darwin.apple_sdk.frameworks.System - ]; + nativeBuildInputs = [ + bison + flex + ]; buildInputs = [ diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix index 0d9e3bc642dd..2923cf1db51c 100644 --- a/pkgs/by-name/mo/moonfire-nvr/package.nix +++ b/pkgs/by-name/mo/moonfire-nvr/package.nix @@ -8,7 +8,6 @@ sqlite, testers, moonfire-nvr, - darwin, nodejs, pnpm_9, }: @@ -59,17 +58,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - ncurses - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - ] - ); + buildInputs = [ + ncurses + sqlite + ]; postInstall = '' mkdir -p $out/lib/ui diff --git a/pkgs/by-name/mo/movine/package.nix b/pkgs/by-name/mo/movine/package.nix index 34f8a00ce89c..0539ec1e8bf5 100644 --- a/pkgs/by-name/mo/movine/package.nix +++ b/pkgs/by-name/mo/movine/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Migration manager written in Rust, that attempts to be smart yet minimal"; diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix index ebda6555cd13..34f4e662a1dd 100644 --- a/pkgs/by-name/mo/movit/package.nix +++ b/pkgs/by-name/mo/movit/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { libX11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL darwin.libobjc ]; diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix index 589e27d4f32b..51578dd19063 100644 --- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix +++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix index 6e52b2ecaa37..0bb272ac6609 100644 --- a/pkgs/by-name/mp/mpris-notifier/package.nix +++ b/pkgs/by-name/mp/mpris-notifier/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-5LDhxciLpDYd4isUQNx8LF3y7m6cfcuIF2atHj/kayg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Dependency-light, highly-customizable, XDG desktop notification generator for MPRIS status changes"; homepage = "https://github.com/l1na-forever/mpris-notifier"; diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix index 01d4cddc5bbc..8a0f001b1788 100644 --- a/pkgs/by-name/mq/mqttui/package.nix +++ b/pkgs/by-name/mq/mqttui/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-gk5nA6np7dK4+j26aySNWfMZ9t/+7nZRaPsnhlDEnes="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - meta = { description = "Terminal client for MQTT"; homepage = "https://github.com/EdJoPaTo/mqttui"; diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 79fc67987ca6..50344eb22589 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -14,7 +14,6 @@ openjpeg, jbig2dec, libjpeg, - darwin, gumbo, enableX11 ? (!stdenv.hostPlatform.isDarwin), libX11, @@ -142,19 +141,10 @@ stdenv.mkDerivation rec { curl openssl ] - ++ lib.optionals enableGL ( - if stdenv.hostPlatform.isDarwin then - with darwin.apple_sdk.frameworks; - [ - GLUT - OpenGL - ] - else - [ - freeglut-mupdf - libGLU - ] - ) + ++ lib.optionals (enableGL && !stdenv.hostPlatform.isDarwin) [ + freeglut-mupdf + libGLU + ] ++ lib.optionals enableOcr [ leptonica tesseract diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 74b80a8b36cb..da3a462c2790 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -2,7 +2,6 @@ lib, stdenv, alsa-lib, - darwin, fetchFromGitHub, pkg-config, protobuf, @@ -32,13 +31,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; meta = { description = "Extensible music player daemon written in Rust"; diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix index 8c59e9833985..fa94ea6ff806 100644 --- a/pkgs/by-name/mu/musikcube/package.nix +++ b/pkgs/by-name/mu/musikcube/package.nix @@ -26,8 +26,6 @@ sndio, systemd, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, - # Darwin Dependencies - darwin, coreaudioSupport ? stdenv.hostPlatform.isDarwin, }: @@ -76,14 +74,6 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib pulseaudio ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - SystemConfiguration - ] - ) - ++ lib.optionals coreaudioSupport (with darwin.apple_sdk.frameworks; [ CoreAudio ]) ++ lib.optionals sndioSupport [ sndio ] ++ lib.optionals pipewireSupport [ pipewire ]; diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index 7e347bafcab7..473580df7738 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, graalvmPackages, installShellFiles, @@ -40,7 +39,7 @@ maven.buildMavenPackage rec { graalvmPackages.graalvm-ce installShellFiles makeWrapper - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; + ]; mvnDepsParameters = mvnParameters; mvnParameters = lib.concatStringsSep " " [ diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index f947e2c1f7ad..fb8ac6f7730a 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -2,9 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, openssl, - darwin, nixosTests, nix-update-script, versionCheckHook, @@ -27,10 +25,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-63AB63vmxXi6ugLCAOKI1eJcOB8XHWEiCc5yoIEqd+w="; nativeBuildInputs = [ versionCheckHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; doInstallCheck = true; diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index d601857dded1..d0e39e5dccea 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools - darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools ]; diff --git a/pkgs/by-name/na/narrowlink/package.nix b/pkgs/by-name/na/narrowlink/package.nix index 66168b2e7cd8..c67aaa36d62d 100644 --- a/pkgs/by-name/na/narrowlink/package.nix +++ b/pkgs/by-name/na/narrowlink/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,11 +22,6 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Security - ]; - meta = { description = "Self-hosted solution to enable secure connectivity between devices across restricted networks like NAT or firewalls"; homepage = "https://github.com/narrowlink/narrowlink"; diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix index 31efe5a446b5..7700a16fe628 100644 --- a/pkgs/by-name/nb/nbtscanner/package.nix +++ b/pkgs/by-name/nb/nbtscanner/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -31,8 +29,6 @@ rustPlatform.buildRustPackage rec { --replace-fail '.version("0.1")' '.version("${version}")' ''; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index 4ab6257c3f7a..ba46eeda5f8d 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -11,7 +11,6 @@ cmake, gperf, stdenv, - darwin, }: let @@ -75,23 +74,14 @@ stdenv.mkDerivation rec { libcgowm ]; - buildInputs = - [ - file # for libmagic - ncurses - openssl - readline - sqlite - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Cocoa - Foundation - ] - ); + buildInputs = [ + file # for libmagic + ncurses + openssl + readline + sqlite + zlib + ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/by-name/ne/neko/package.nix b/pkgs/by-name/ne/neko/package.nix index 22dc97f7d1d6..ee69504c27fe 100644 --- a/pkgs/by-name/ne/neko/package.nix +++ b/pkgs/by-name/ne/neko/package.nix @@ -45,25 +45,19 @@ stdenv.mkDerivation rec { pkg-config git ]; - buildInputs = - [ - boehmgc - zlib - sqlite - pcre - apacheHttpd - apr - aprutil - libmysqlclient - mbedtls_2 - openssl - libpthreadstubs - ] - ++ lib.optional stdenv.hostPlatform.isLinux gtk2 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Security - pkgs.darwin.apple_sdk.frameworks.Carbon - ]; + buildInputs = [ + boehmgc + zlib + sqlite + pcre + apacheHttpd + apr + aprutil + libmysqlclient + mbedtls_2 + openssl + libpthreadstubs + ] ++ lib.optional stdenv.hostPlatform.isLinux gtk2; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix index 76c5f37fb143..3a8feae70c07 100644 --- a/pkgs/by-name/ne/nest-cli/package.nix +++ b/pkgs/by-name/ne/nest-cli/package.nix @@ -1,10 +1,8 @@ { buildNpmPackage, - darwin, fetchFromGitHub, lib, python3, - stdenv, }: buildNpmPackage rec { @@ -28,10 +26,6 @@ buildNpmPackage rec { python3 ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = with lib; { description = "CLI tool for Nest applications"; homepage = "https://nestjs.com"; diff --git a/pkgs/by-name/ne/net-snmp/package.nix b/pkgs/by-name/ne/net-snmp/package.nix index a8c268e2abb9..c1ad4ea5d064 100644 --- a/pkgs/by-name/ne/net-snmp/package.nix +++ b/pkgs/by-name/ne/net-snmp/package.nix @@ -9,7 +9,6 @@ nettools, autoreconfHook, withPerlTools ? false, - darwin, }: let @@ -84,15 +83,7 @@ stdenv.mkDerivation rec { file autoreconfHook ]; - buildInputs = - [ openssl ] - ++ lib.optional withPerlTools perlWithPkgs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.DiskArbitration - ]; + buildInputs = [ openssl ] ++ lib.optional withPerlTools perlWithPkgs; enableParallelBuilding = true; # Missing dependencies during relinking: diff --git a/pkgs/by-name/ne/netbox2netshot/package.nix b/pkgs/by-name/ne/netbox2netshot/package.nix index 96d1bbb78e00..c6191cd6bdfa 100644 --- a/pkgs/by-name/ne/netbox2netshot/package.nix +++ b/pkgs/by-name/ne/netbox2netshot/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Inventory synchronization tool between Netbox and Netshot"; diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index 8a54783f91f6..fd45a8ee81cd 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, pkg-config, - darwin, installShellFiles, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, @@ -36,17 +35,7 @@ rustPlatform.buildRustPackage rec { pkg-config ] ++ lib.optional (installManPages || installShellCompletions) installShellFiles; - buildInputs = - [ ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Cocoa - Security - ] - ) - ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch; + buildInputs = lib.optional (builtins.elem "notmuch" buildFeatures) notmuch; # TODO: unit tests temporarily broken, remove this line for the next # beta.2 release diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index 96c63f9951a9..8e9d82719ffd 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -11,7 +11,6 @@ libxml2, json_c, ncurses, - darwin, asciidoctor, libiconv, makeWrapper, @@ -59,15 +58,10 @@ rustPlatform.buildRustPackage (finalAttrs: { json_c ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - Foundation - libiconv - gettext - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + gettext + ]; postBuild = '' make -j $NIX_BUILD_CORES prefix="$out" diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index aeef324f1a0b..2548228134e5 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -1,10 +1,8 @@ { - stdenv, lib, rustPlatform, installShellFiles, makeBinaryWrapper, - darwin, fetchFromGitHub, nix-update-script, nvd, @@ -35,10 +33,6 @@ rustPlatform.buildRustPackage { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - preFixup = '' mkdir completions $out/bin/nh completions --shell bash > completions/nh.bash diff --git a/pkgs/by-name/ni/nim-2_2/package.nix b/pkgs/by-name/ni/nim-2_2/package.nix index f97506eb624a..0253925887ce 100644 --- a/pkgs/by-name/ni/nim-2_2/package.nix +++ b/pkgs/by-name/ni/nim-2_2/package.nix @@ -28,7 +28,6 @@ let # Needed for any nim package that uses the standard library's # 'std/sysrand' module. - depsTargetTargetPropagated = lib.optional stdenv.hostPlatform.isDarwin Security; inherit patches; diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix index 0ecdbe92b511..28f6bb6d2bb0 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { pcre readline sqlite - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; patches = [ ./NIM_CONFIG_DIR.patch diff --git a/pkgs/by-name/ni/nix-btm/package.nix b/pkgs/by-name/ni/nix-btm/package.nix index 742da2fb0a68..c14740055ad0 100644 --- a/pkgs/by-name/ni/nix-btm/package.nix +++ b/pkgs/by-name/ni/nix-btm/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchCrate, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,14 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-zMQw3Q9t6JSMDt7xHMGTgAu9LW6MhG+Rrjpp5IEs/qQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); - meta = with lib; { description = "Rust tool to monitor Nix processes"; homepage = "https://github.com/DieracDelta/nix-btm"; diff --git a/pkgs/by-name/ni/nix-health/package.nix b/pkgs/by-name/ni/nix-health/package.nix index ab6cf7acfec3..5ca8e3ca2b9d 100644 --- a/pkgs/by-name/ni/nix-health/package.nix +++ b/pkgs/by-name/ni/nix-health/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchCrate, libiconv, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,20 +21,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-3DE/NwPdi//7xaoV2SVgF5l3ndrEYraoyg5NLJzvzBI="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libiconv - openssl - ] - # Use a newer SDK for CoreFoundation, because the sysinfo crate requires - # it, https://github.com/GuillaumeGomez/sysinfo/issues/915 - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - IOKit - CoreFoundation - ] - ); + buildInputs = [ + libiconv + openssl + ]; meta = with lib; { description = "Check the health of your Nix setup"; diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix index 961ea4afe735..fa4ad7a7a722 100644 --- a/pkgs/by-name/ni/nix-weather/package.nix +++ b/pkgs/by-name/ni/nix-weather/package.nix @@ -5,7 +5,6 @@ rustPlatform, pkg-config, openssl, - darwin, libiconv, installShellFiles, nix-update-script, @@ -36,8 +35,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; outputs = [ diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index 2511a260b279..9149274b37d3 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -7,7 +7,6 @@ openssl, nixVersions, nixPackage ? nixVersions.stable, - darwin, }: let @@ -31,15 +30,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PfbDod1vQDnWqbhRgXbOvidxGWIXIe7XIgqiLVbovh0="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optional (!stdenv.hostPlatform.isDarwin) openssl - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl; postPatch = '' substituteInPlace nix-web/nix-web.service \ diff --git a/pkgs/by-name/ni/nixci/package.nix b/pkgs/by-name/ni/nixci/package.nix index 458a03ade240..267107cbdb46 100644 --- a/pkgs/by-name/ni/nixci/package.nix +++ b/pkgs/by-name/ni/nixci/package.nix @@ -5,9 +5,6 @@ fetchFromGitHub, openssl, pkg-config, - Security, - SystemConfiguration, - IOKit, installShellFiles, nix, }: @@ -32,15 +29,9 @@ rustPlatform.buildRustPackage rec { nix ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Security - SystemConfiguration - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; postInstall = '' installShellCompletion --cmd nixci \ diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index 8e895030339f..9f6077c56768 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Aw794yhIET8/pnlQiK2xKVbYC/Kd5MExvFTwkv4LLTc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; - meta = with lib; { description = "Generate documentation for Nix functions"; mainProgram = "nixdoc"; diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix index 13139e54b6db..71bc900fed88 100644 --- a/pkgs/by-name/ni/nixtract/package.nix +++ b/pkgs/by-name/ni/nixtract/package.nix @@ -6,7 +6,6 @@ openssl, stdenv, libiconv, - darwin, nix, testers, nixtract, @@ -32,7 +31,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ nix ]; diff --git a/pkgs/by-name/no/nodehun/package.nix b/pkgs/by-name/no/nodehun/package.nix index 36426f03ea83..d903cf04e92d 100644 --- a/pkgs/by-name/no/nodehun/package.nix +++ b/pkgs/by-name/no/nodehun/package.nix @@ -1,7 +1,6 @@ { buildNpmPackage, cctools, - darwin, fetchFromGitHub, lib, node-gyp, @@ -30,10 +29,6 @@ buildNpmPackage { ]; npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; nativeBuildInputs = [ node-gyp python3 diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix index 485cced95575..f73007bf9a08 100644 --- a/pkgs/by-name/no/nostr-rs-relay/package.nix +++ b/pkgs/by-name/no/nostr-rs-relay/package.nix @@ -6,7 +6,6 @@ openssl, pkg-config, libiconv, - darwin, protobuf, }: @@ -27,8 +26,6 @@ rustPlatform.buildRustPackage rec { [ openssl.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix index 6c32f8c19c94..97413ca90f7c 100644 --- a/pkgs/by-name/no/nostui/package.nix +++ b/pkgs/by-name/no/nostui/package.nix @@ -2,8 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -17,10 +15,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RCD11KdzM66Mkydc51r6fG+q8bmKl5eZma58YoARwPo="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; [ frameworks.SystemConfiguration ] - ); - GIT_HASH = "000000000000000000000000000000000000000000000000000"; checkFlags = [ diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix index af926182fa91..1d0709049b08 100644 --- a/pkgs/by-name/no/notes/package.nix +++ b/pkgs/by-name/no/notes/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, qt6, - darwin, overrideSDK, }: let @@ -29,14 +28,10 @@ stdenv'.mkDerivation (finalAttrs: { qt6.wrapQtAppsHook ]; - buildInputs = - [ - qt6.qtbase - qt6.qtdeclarative - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - ]; + buildInputs = [ + qt6.qtbase + qt6.qtdeclarative + ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index 3c9db899f070..8898152794e1 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -7,7 +7,6 @@ stdenv, installShellFiles, libiconv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,7 +29,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/nowplaying-cli/package.nix b/pkgs/by-name/no/nowplaying-cli/package.nix index f959cfd02c6f..61f46f60930c 100644 --- a/pkgs/by-name/no/nowplaying-cli/package.nix +++ b/pkgs/by-name/no/nowplaying-cli/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -16,12 +15,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FkyrtgsGzpK2rLNr+oxfPUbX43TVXYeiBg7CN1JUg8Y="; }; - buildInputs = [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Cocoa - ]; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/np/npins/package.nix b/pkgs/by-name/np/npins/package.nix index 4b9269f11d14..db9340044293 100644 --- a/pkgs/by-name/np/npins/package.nix +++ b/pkgs/by-name/np/npins/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, makeWrapper, - stdenv, - darwin, # runtime dependencies nix, # for nix-prefetch-url @@ -33,13 +31,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-HnX7dkWLxa3DARXG8y9OVBRwvwgxwRIs4mWK3VNblG0="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); nativeBuildInputs = [ makeWrapper ]; # (Almost) all tests require internet diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix index 0946695d21ad..4da4d7f0e896 100644 --- a/pkgs/by-name/nu/nurl/package.nix +++ b/pkgs/by-name/nu/nurl/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, installShellFiles, makeBinaryWrapper, - stdenv, - darwin, gitMinimal, mercurial, nixForLinking, @@ -30,10 +28,6 @@ rustPlatform.buildRustPackage rec { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # tests require internet access doCheck = false; diff --git a/pkgs/by-name/od/ode/package.nix b/pkgs/by-name/od/ode/package.nix index cdef316b45a2..b41cb0e48b31 100644 --- a/pkgs/by-name/od/ode/package.nix +++ b/pkgs/by-name/od/ode/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -14,11 +13,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yRooxv8mUChHhKeccmo4DWr+yH7PejXDKmvgxbdFE+g="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.GLUT - ]; - env.CXXFLAGS = lib.optionalString stdenv.cc.isClang (toString [ "-std=c++14" "-Wno-error=c++11-narrowing" diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 7ba4aa030a47..20cadb0eff29 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -5,7 +5,6 @@ stdenv, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; # tests don't work inside the sandbox doCheck = false; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index d1f9837372db..c77df9316792 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -17,7 +17,6 @@ rocmGpuTargets ? rocmPackages.clr.gpuTargets or [ ], cudaPackages, cudaArches ? cudaPackages.cudaFlags.realArches or [ ], - darwin, autoAddDriverRunpath, # passthru @@ -103,13 +102,6 @@ let cudaPath = lib.removeSuffix "-${cudaMajorVersion}" cudaToolkit; - metalFrameworks = with darwin.apple_sdk_11_0.frameworks; [ - Accelerate - Metal - MetalKit - MetalPerformanceShaders - ]; - wrapperOptions = [ # ollama embeds llama-cpp binaries which actually run the ai models @@ -173,13 +165,11 @@ goBuild { ++ lib.optionals (enableRocm || enableCuda) [ makeWrapper autoAddDriverRunpath - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; + ]; buildInputs = lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) - ++ lib.optionals enableCuda cudaLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; + ++ lib.optionals enableCuda cudaLibs; # replace inaccurate version number with actual release version postPatch = '' diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 7ae098af1898..eb59f6b8e6d3 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -12,8 +12,6 @@ gtk4, libadwaita, pango, - stdenv, - darwin, cargo-make, }: @@ -35,22 +33,15 @@ rustPlatform.buildRustPackage rec { cargo-make ]; - buildInputs = - [ - cairo - dbus - gdk-pixbuf - glib - gtk4 - libadwaita - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreBluetooth - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + cairo + dbus + gdk-pixbuf + glib + gtk4 + libadwaita + pango + ]; useFetchCargoVendor = true; cargoHash = "sha256-3K+/CpTGWSjCRa2vOEcDvLIiZMdntugIqnzkXF4wkng="; diff --git a/pkgs/by-name/op/openboardview/package.nix b/pkgs/by-name/op/openboardview/package.nix index c68764ee1f6a..71f71e966e61 100644 --- a/pkgs/by-name/op/openboardview/package.nix +++ b/pkgs/by-name/op/openboardview/package.nix @@ -11,12 +11,8 @@ fontconfig, gtk3, wrapGAppsHook3, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation rec { pname = "openboardview"; version = "9.95.0"; @@ -44,15 +40,11 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook3 ]; - buildInputs = - [ - SDL2 - fontconfig - gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + SDL2 + fontconfig + gtk3 + ]; postPatch = '' substituteInPlace src/openboardview/CMakeLists.txt \ diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix index 293eac8660b2..6295a0c98e38 100644 --- a/pkgs/by-name/op/opencascade-occt/package.nix +++ b/pkgs/by-name/op/opencascade-occt/package.nix @@ -13,7 +13,6 @@ libXext, libXmu, libXi, - darwin, }: stdenv.mkDerivation rec { @@ -50,7 +49,7 @@ stdenv.mkDerivation rec { libXmu libXi rapidjson - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; cmakeFlags = [ "-DUSE_RAPIDJSON=ON" ]; diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix index bb6bd763ea1d..84c4f11dfdea 100644 --- a/pkgs/by-name/op/openctm/package.nix +++ b/pkgs/by-name/op/openctm/package.nix @@ -6,7 +6,6 @@ libglut, gtk2, libGLU, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -27,13 +26,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libglut - libGLU - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = [ + libglut + libGLU + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index b15816eefc19..5cef5dbb3826 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -3,7 +3,6 @@ config, cudaPackages, cudaSupport ? config.cudaSupport, - darwin, fetchzip, ispc, lib, @@ -42,14 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ tbb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Accelerate - MetalKit - MetalPerformanceShadersGraph - ] - ) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart cudaPackages.cuda_cccl diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix index 7b5e0bffc3d2..55195c940688 100644 --- a/pkgs/by-name/op/openpgp-ca/package.nix +++ b/pkgs/by-name/op/openpgp-ca/package.nix @@ -1,8 +1,6 @@ { - stdenv, fetchFromGitLab, lib, - darwin, nettle, nix-update-script, rustPlatform, @@ -36,21 +34,12 @@ rustPlatform.buildRustPackage rec { gnupg ]; - buildInputs = - [ - openssl - sqlite - pcsclite - nettle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - PCSC - Security - SystemConfiguration - ] - ); + buildInputs = [ + openssl + sqlite + pcsclite + nettle + ]; # Most tests rely on gnupg being able to write to /run/user # gnupg refuses to respect the XDG_RUNTIME_DIR variable, so we skip the tests diff --git a/pkgs/by-name/op/opensaml-cpp/package.nix b/pkgs/by-name/op/opensaml-cpp/package.nix index 9eac6e3074da..6bbe4f57d718 100644 --- a/pkgs/by-name/op/opensaml-cpp/package.nix +++ b/pkgs/by-name/op/opensaml-cpp/package.nix @@ -4,7 +4,6 @@ fetchgit, autoreconfHook, pkg-config, - darwin, boost, openssl, log4shib, @@ -24,23 +23,15 @@ stdenv.mkDerivation rec { sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8"; }; - buildInputs = - [ - boost - openssl - log4shib - xercesc - xml-security-c - xml-tooling-c - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + boost + openssl + log4shib + xercesc + xml-security-c + xml-tooling-c + zlib + ]; nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix index 588993c98e37..8d42b97d3640 100644 --- a/pkgs/by-name/op/opensubdiv/package.nix +++ b/pkgs/by-name/op/opensubdiv/package.nix @@ -14,7 +14,6 @@ cudaSupport ? config.cudaSupport, cudaPackages, openclSupport ? !cudaSupport, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -57,18 +56,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXi ] ++ lib.optionals (openclSupport && stdenv.hostPlatform.isLinux) [ ocl-icd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - OpenCL - Cocoa - CoreVideo - IOKit - AppKit - AGL - MetalKit - ] - ) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index f6c984e4b9df..c93d0ba40100 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -4,7 +4,6 @@ ceres-solver, cmake, cminpack, - darwin, dlib, fetchFromGitHub, hdf5, @@ -24,9 +23,6 @@ enablePython ? false, }: -let - inherit (darwin.apple_sdk.frameworks) Accelerate; -in stdenv.mkDerivation (finalAttrs: { pname = "openturns"; version = "1.24"; @@ -64,9 +60,6 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.matplotlib python3Packages.psutil python3Packages.python - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate ]; cmakeFlags = [ diff --git a/pkgs/by-name/op/openvr/package.nix b/pkgs/by-name/op/openvr/package.nix index 501a74ec098f..fa65d10af9e3 100644 --- a/pkgs/by-name/op/openvr/package.nix +++ b/pkgs/by-name/op/openvr/package.nix @@ -1,9 +1,7 @@ { - AppKit, cmake, fetchFromGitHub, fetchpatch2, - Foundation, jsoncpp, lib, libGL, @@ -48,15 +46,10 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = - [ - jsoncpp - libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Foundation - ]; + buildInputs = [ + jsoncpp + libGL + ]; cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix index 5cf56cc1bf9c..482bd1c767f3 100644 --- a/pkgs/by-name/or/oranda/package.nix +++ b/pkgs/by-name/or/oranda/package.nix @@ -6,7 +6,6 @@ tailwindcss, oniguruma, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,14 +27,9 @@ rustPlatform.buildRustPackage rec { tailwindcss ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + oniguruma + ]; # requires internet access checkFlags = [ diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 6f03e4c6c1cc..29f9deb8bca1 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; dontUseCargoParallelTests = true; diff --git a/pkgs/by-name/or/orogene/package.nix b/pkgs/by-name/or/orogene/package.nix index 510b0c67dcae..778111e1a2cf 100644 --- a/pkgs/by-name/or/orogene/package.nix +++ b/pkgs/by-name/or/orogene/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; preCheck = '' export CI=true diff --git a/pkgs/by-name/os/osxsnarf/package.nix b/pkgs/by-name/os/osxsnarf/package.nix index aa4f22baa43e..d57c7523b53d 100644 --- a/pkgs/by-name/os/osxsnarf/package.nix +++ b/pkgs/by-name/os/osxsnarf/package.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, plan9port, - darwin, ... }: @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ plan9port - darwin.apple_sdk.frameworks.Carbon ]; makeFlags = [ "prefix=${placeholder "out"}" ]; diff --git a/pkgs/by-name/ow/owl-compositor/package.nix b/pkgs/by-name/ow/owl-compositor/package.nix index 6a25f6a56879..95e664b19889 100644 --- a/pkgs/by-name/ow/owl-compositor/package.nix +++ b/pkgs/by-name/ow/owl-compositor/package.nix @@ -54,9 +54,6 @@ stdenv.mkDerivation { libxkbcommon wayland ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gnustep-back ]; diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 75e98dd7d0e9..082265addff8 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -12,7 +12,6 @@ mono, wrapWithMono ? true, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -41,10 +40,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix index fc18cc37c64a..3176d0ffcdd1 100644 --- a/pkgs/by-name/ox/oxide-rs/package.nix +++ b/pkgs/by-name/ox/oxide-rs/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -47,17 +45,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 03798b666fc7..65a572e6d96a 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, rust-jemalloc-sys, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,13 +19,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-/OLcyHTTevqpkrHY3Ueo38xtIjhjE4quqPTEZfPEcaY="; - buildInputs = - [ - rust-jemalloc-sys - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + rust-jemalloc-sys + ]; env.OXC_VERSION = version; diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix index 16fb274d0130..d004151ec79c 100644 --- a/pkgs/by-name/p2/p2pool/package.nix +++ b/pkgs/by-name/p2/p2pool/package.nix @@ -12,12 +12,8 @@ openssl, pkg-config, zeromq, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Foundation; -in stdenv.mkDerivation rec { pname = "p2pool"; version = "4.4"; @@ -42,7 +38,7 @@ stdenv.mkDerivation rec { hwloc openssl curl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + ]; cmakeFlags = [ "-DWITH_LTO=OFF" ]; diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix index 7834c46fc2e7..c8c579a074d7 100644 --- a/pkgs/by-name/pa/panamax/package.nix +++ b/pkgs/by-name/pa/panamax/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,16 +22,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; meta = with lib; { description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; diff --git a/pkgs/by-name/pa/panotools/package.nix b/pkgs/by-name/pa/panotools/package.nix index 1616159e31c1..f9af218e70ed 100644 --- a/pkgs/by-name/pa/panotools/package.nix +++ b/pkgs/by-name/pa/panotools/package.nix @@ -7,7 +7,6 @@ libpng, libtiff, perl, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -26,15 +25,11 @@ stdenv.mkDerivation (finalAttrs: { perl ]; - buildInputs = - [ - libjpeg - libpng - libtiff - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Carbon - ]; + buildInputs = [ + libjpeg + libpng + libtiff + ]; meta = { description = "Free software suite for authoring and displaying virtual reality panoramas"; diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix index b2f852a4709a..065a5354c571 100644 --- a/pkgs/by-name/pa/paper-plane/package.nix +++ b/pkgs/by-name/pa/paper-plane/package.nix @@ -17,7 +17,6 @@ libxml2, libshumate, gst_all_1, - darwin, buildPackages, }: @@ -90,20 +89,16 @@ stdenv.mkDerivation { libxml2.bin ]; - buildInputs = - [ - libshumate - libadwaita-paperplane - tdlib-paperplane - rlottie-paperplane - gst_all_1.gstreamer - gst_all_1.gst-libav - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libshumate + libadwaita-paperplane + tdlib-paperplane + rlottie-paperplane + gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ]; mesonFlags = [ # The API ID and hash provided here are for use with Paper Plane only. diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index d6011a8caa02..6a89d3bccc28 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -8,7 +8,6 @@ gettext, python3, giflib, - darwin, ghostscript_headless, imagemagickBig, jbig2enc, @@ -91,7 +90,6 @@ let ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib - darwin.apple_sdk.frameworks.CoreText ]; CYPRESS_INSTALL_BINARY = "0"; diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index dfd126181208..91519bace881 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -15,7 +15,6 @@ itstool, poppler, nautilus, - darwin, djvulibre, libspectre, libarchive, @@ -100,9 +99,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals supportNautilus [ nautilus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation ]; mesonFlags = diff --git a/pkgs/by-name/pa/partio/package.nix b/pkgs/by-name/pa/partio/package.nix index 771169e90c28..9c2cc4c91f7e 100644 --- a/pkgs/by-name/pa/partio/package.nix +++ b/pkgs/by-name/pa/partio/package.nix @@ -12,7 +12,6 @@ doxygen, xorg, python3, - darwin, }: stdenv.mkDerivation rec { @@ -46,10 +45,6 @@ stdenv.mkDerivation rec { xorg.libXi xorg.libXmu ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.GLUT - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libglut libGLU diff --git a/pkgs/by-name/pa/pazi/package.nix b/pkgs/by-name/pa/pazi/package.nix index 560f1e7c7a10..59aad8623053 100644 --- a/pkgs/by-name/pa/pazi/package.nix +++ b/pkgs/by-name/pa/pazi/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, installShellFiles, }: @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - useFetchCargoVendor = true; cargoHash = "sha256-/r/nRQ/7KyUmJK19F557AcxXEXa85E/CE6+YFU6DdR4="; diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix index a06b35650757..933156c3e5d6 100644 --- a/pkgs/by-name/pe/pest-ide-tools/package.nix +++ b/pkgs/by-name/pe/pest-ide-tools/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, nix-update-script, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,9 +17,6 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix index 33ffa99ff901..b01632e6a4fb 100644 --- a/pkgs/by-name/pf/pfetch-rs/package.nix +++ b/pkgs/by-name/pf/pfetch-rs/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-36MjBzSzEOVaSnd6dTqYnV+Pi+5EDoUskkYsvYMGrgg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.DisplayServices - ]; - meta = with lib; { description = "Rewrite of the pfetch system information tool in Rust"; homepage = "https://github.com/Gobidev/pfetch-rs"; diff --git a/pkgs/by-name/pg/pgcat/package.nix b/pkgs/by-name/pg/pgcat/package.nix index 159acd4ca1e7..e0e8945250a8 100644 --- a/pkgs/by-name/pg/pgcat/package.nix +++ b/pkgs/by-name/pg/pgcat/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, nix-update-script, testers, pgcat, @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-6x/IPFncfOPxautW7gVUh5LG0hK4h6T4QL7B82Moi6o="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # requires network access "--skip=dns_cache" diff --git a/pkgs/by-name/pi/picocom/package.nix b/pkgs/by-name/pi/picocom/package.nix index 4a549e27921c..bca2dbd1f25d 100644 --- a/pkgs/by-name/pi/picocom/package.nix +++ b/pkgs/by-name/pi/picocom/package.nix @@ -7,7 +7,6 @@ go-md2man, installShellFiles, linenoise, - darwin, lrzsz, }: @@ -35,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ linenoise - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + ]; makeFlags = [ "HISTFILE=.cache/picocom_history" diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix index b36051cd5e42..c57f590b7e6f 100644 --- a/pkgs/by-name/pi/pict-rs/package.nix +++ b/pkgs/by-name/pi/pict-rs/package.nix @@ -5,7 +5,6 @@ rustPlatform, makeWrapper, protobuf, - darwin, imagemagick, ffmpeg, exiftool, @@ -32,7 +31,6 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; postInstall = '' wrapProgram "$out/bin/pict-rs" \ diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 6e2e45eac3b0..8f7cbd50042d 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -8,7 +8,6 @@ libsodium, openssl, xxHash, - darwin, gitImportSupport ? true, libgit2 ? null, }: @@ -30,21 +29,11 @@ rustPlatform.buildRustPackage rec { installShellFiles pkg-config ]; - buildInputs = - [ - openssl - libsodium - xxHash - ] - ++ (lib.optionals gitImportSupport [ libgit2 ]) - ++ (lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - Security - SystemConfiguration - ] - )); + buildInputs = [ + openssl + libsodium + xxHash + ] ++ (lib.optionals gitImportSupport [ libgit2 ]); buildFeatures = lib.optional gitImportSupport "git"; diff --git a/pkgs/by-name/pi/pilot-link/package.nix b/pkgs/by-name/pi/pilot-link/package.nix index e8eef25e3652..6afc7c1cfee5 100644 --- a/pkgs/by-name/pi/pilot-link/package.nix +++ b/pkgs/by-name/pi/pilot-link/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, autoreconfHook, pkg-config, - darwin, popt, bluezSupport ? stdenv.hostPlatform.isLinux, bluez, @@ -47,8 +46,7 @@ stdenv.mkDerivation { ++ lib.optionals bluezSupport [ bluez ] ++ lib.optionals enableLibpng [ libpng ] ++ lib.optionals enableLibusb [ libusb-compat-0_1 ] - ++ lib.optionals readlineSupport [ readline ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); + ++ lib.optionals readlineSupport [ readline ]; configureFlags = [ "--with-libiconv" ] diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix index 227ff18f4b64..ff4a1b734a85 100644 --- a/pkgs/by-name/pi/piv-agent/package.nix +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -2,7 +2,6 @@ lib, stdenv, buildGoModule, - darwin, fetchFromGitHub, pcsclite, pkg-config, @@ -32,8 +31,7 @@ buildGoModule rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ pcsclite ]; meta = with lib; { description = "SSH and GPG agent which you can use with your PIV hardware security device (e.g. a Yubikey)"; diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index 3ddc577400bb..60d6d1174605 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -1,9 +1,7 @@ { lib, fetchFromGitHub, - darwin, rustPlatform, - stdenv, }: rustPlatform.buildRustPackage rec { pname = "pkarr"; @@ -19,14 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-y20vVO714WPcB2aYzo0LBuJhy224bsHA7O9Dj00ViWE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - meta = { description = "Public Key Addressable Resource Records (sovereign TLDs) "; homepage = "https://github.com/pubky/pkarr"; diff --git a/pkgs/by-name/pl/plink-ng/package.nix b/pkgs/by-name/pl/plink-ng/package.nix index 74b04c56ecce..ea697c070e4e 100644 --- a/pkgs/by-name/pl/plink-ng/package.nix +++ b/pkgs/by-name/pl/plink-ng/package.nix @@ -5,7 +5,6 @@ zlib, blas, lapack, - darwin, }: stdenv.mkDerivation rec { @@ -20,16 +19,13 @@ stdenv.mkDerivation rec { }; buildInputs = - [ zlib ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ darwin.apple_sdk.frameworks.Accelerate ] - else - [ - blas - lapack - ] - ); + [ + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + blas + lapack + ]; preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h diff --git a/pkgs/by-name/po/porsmo/package.nix b/pkgs/by-name/po/porsmo/package.nix index 21dba217b326..4ae2993d59d1 100644 --- a/pkgs/by-name/po/porsmo/package.nix +++ b/pkgs/by-name/po/porsmo/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, alsa-lib, - stdenv, - darwin, testers, porsmo, }: @@ -29,14 +27,9 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreAudio - darwin.apple_sdk.frameworks.CoreFoundation - ]; + buildInputs = [ + alsa-lib + ]; passthru.tests.version = testers.testVersion { package = porsmo; diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix index 4dce0784aca0..06fdc363d711 100644 --- a/pkgs/by-name/pr/process-viewer/package.nix +++ b/pkgs/by-name/pr/process-viewer/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, gtk4, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -22,11 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ gtk4 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Foundation - ]; + buildInputs = [ gtk4 ]; postInstall = '' install -Dm644 assets/fr.guillaume_gomez.ProcessViewer.desktop -t $out/share/applications diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix index 5b27b6ffe9ce..657d2616f4b7 100644 --- a/pkgs/by-name/pr/projectable/package.nix +++ b/pkgs/by-name/pr/projectable/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index 3d805a9bd28a..d36c608385af 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, nixosTests, - darwin, }: buildGoModule rec { @@ -24,14 +22,6 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - IOKit - ] - ); - excludedPackages = [ "docs/node-mixin" ]; ldflags = [ diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 295397823535..d7d23d039b38 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, libiconv, makeBinaryWrapper, pkg-config, @@ -24,7 +23,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-3zN7t3yplRm4/P0m316uSooDftgJicvWIvz34jzOmBY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix index 4715f0cf80ca..d16e452b3a9c 100644 --- a/pkgs/by-name/pr/prr/package.nix +++ b/pkgs/by-name/pr/prr/package.nix @@ -2,10 +2,8 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -22,12 +20,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-VIJFr1HpXMC2DXt79Yb1DuLYSbo9g6zsXaNDTXjtlR4="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ps/pstoedit/package.nix b/pkgs/by-name/ps/pstoedit/package.nix index af1916667b2d..3a09cd624692 100644 --- a/pkgs/by-name/ps/pstoedit/package.nix +++ b/pkgs/by-name/ps/pstoedit/package.nix @@ -2,7 +2,6 @@ stdenv, fetchurl, pkg-config, - darwin, lib, zlib, ghostscript, @@ -42,13 +41,9 @@ stdenv.mkDerivation rec { libjpeg libwebp ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - libiconv - ApplicationServices - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; # '@LIBPNG_LDFLAGS@' is no longer substituted by autoconf (the code is commented out) # so we need to remove it from the pkg-config file as well diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix index 0ef4f94a3df1..49e631789eb4 100644 --- a/pkgs/by-name/pw/pwsafe/package.nix +++ b/pkgs/by-name/pw/pwsafe/package.nix @@ -20,13 +20,9 @@ curl, openssl, file, - darwin, gitUpdater, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation rec { pname = "pwsafe"; version = "1.20.0"; # do NOT update to 3.x Windows releases @@ -66,9 +62,6 @@ stdenv.mkDerivation rec { libuuid libyubikey yubikey-personalization - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa ]; cmakeFlags = diff --git a/pkgs/by-name/qg/qgrep/package.nix b/pkgs/by-name/qg/qgrep/package.nix index dbcd06c4ce67..a6961947e75c 100644 --- a/pkgs/by-name/qg/qgrep/package.nix +++ b/pkgs/by-name/qg/qgrep/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchpatch, - darwin, }: stdenv.mkDerivation rec { @@ -26,11 +25,6 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.CoreFoundation - ]; - env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=unused-command-line-argument" diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index 2620a8d0057d..1c7f55d5f828 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -1,13 +1,11 @@ { rustPlatform, - stdenv, fetchFromGitHub, fetchurl, pkg-config, perl, openssl, lib, - darwin, }: rustPlatform.buildRustPackage rec { pname = "r0vm"; @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ - openssl.dev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl.dev + ]; doCheck = false; diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 5b4acfd1c8b8..262de4fba351 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -1,6 +1,5 @@ { asciidoctor, - darwin, fetchgit, git, installShellFiles, @@ -34,7 +33,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; nativeCheckInputs = [ git ]; - buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; doCheck = stdenv.hostPlatform.isLinux; diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index b0a6bae693e1..a9bcb469f4f8 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -1,6 +1,5 @@ { asciidoctor, - darwin, fetchgit, git, installShellFiles, @@ -41,9 +40,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; nativeCheckInputs = [ git ]; - buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; # tests regularly time out on aarch64 doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix index 1de79c3d1b7f..9c359fa71505 100644 --- a/pkgs/by-name/ra/rage/package.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +24,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - # cargo test has an x86-only dependency doCheck = stdenv.hostPlatform.isx86; diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 1fd672670492..f62f7f7bae42 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -1,15 +1,10 @@ { lib, - darwin, rustPlatform, fetchFromGitHub, pkg-config, openssl, - stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; -in rustPlatform.buildRustPackage rec { pname = "railway"; version = "4.0.0"; @@ -26,13 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 36338b43709f..4a9b130ce89a 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -1,11 +1,9 @@ { lib, - darwin, fetchFromGitHub, testers, nix-update-script, rustPlatform, - stdenv, rainfrog, }: let @@ -25,15 +23,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-C5Wn/Qe+VSCFEma7IAmxGK2t2xugWOt2BaF7izsCU+I="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreGraphics - SystemConfiguration - ] - ); - passthru = { tests.version = testers.testVersion { package = rainfrog; diff --git a/pkgs/by-name/ra/rapidsvn/package.nix b/pkgs/by-name/ra/rapidsvn/package.nix index e6d2b1f5ca8a..abbaeca4ef56 100644 --- a/pkgs/by-name/ra/rapidsvn/package.nix +++ b/pkgs/by-name/ra/rapidsvn/package.nix @@ -8,7 +8,6 @@ apr, aprutil, python3, - darwin, }: stdenv.mkDerivation { @@ -31,17 +30,13 @@ stdenv.mkDerivation { autoreconfHook ]; - buildInputs = - [ - wxGTK32 - subversion - apr - aprutil - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + wxGTK32 + subversion + apr + aprutil + python3 + ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix index 314b69d7890e..9621e30adc04 100644 --- a/pkgs/by-name/ra/rates/package.nix +++ b/pkgs/by-name/ra/rates/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-qfuCA1kAEbYIYI274lNrEKZNhltQP71CwtsjBr0REJs="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ra/raylib-games/package.nix b/pkgs/by-name/ra/raylib-games/package.nix index 8bc325841060..3ca74877fbb4 100644 --- a/pkgs/by-name/ra/raylib-games/package.nix +++ b/pkgs/by-name/ra/raylib-games/package.nix @@ -3,12 +3,8 @@ stdenv, fetchFromGitHub, raylib, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation rec { pname = "raylib-games"; version = "2022-10-24"; @@ -20,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4="; }; - buildInputs = [ raylib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + buildInputs = [ raylib ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index f6d630ae31af..47ebd121f996 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -17,13 +16,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gFkrUqG3GXPAg9Zqv7Wr3axQ30axYGXw8bo+P1kmSJM="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - IOKit - ] - ); - useFetchCargoVendor = true; cargoHash = "sha256-izJRaxJhLvk064JB3hlzN50V7ZWmv/X1pbL0lRCZV60="; diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix index b32356df4cb7..6edeccfdd07d 100644 --- a/pkgs/by-name/re/realm/package.nix +++ b/pkgs/by-name/re/realm/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nix-update-script, nixosTests, }: @@ -22,10 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Oe64l16uYdU6NvTl7XrEm6dAtRFngI9yHC4fe4hpTNA="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - env.RUSTC_BOOTSTRAP = 1; passthru = { diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix index 9a3dc6692732..e3ce9f006665 100644 --- a/pkgs/by-name/re/reason-shell/package.nix +++ b/pkgs/by-name/re/reason-shell/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Shell for research papers"; diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix index e8400ee8c1b9..31b05abbb910 100644 --- a/pkgs/by-name/re/rebuilderd/package.nix +++ b/pkgs/by-name/re/rebuilderd/package.nix @@ -12,7 +12,6 @@ xz, zstd, stdenv, - darwin, buildPackages, versionCheckHook, nixosTests, @@ -50,19 +49,14 @@ rustPlatform.buildRustPackage (finalAttrs: { scdoc ]; - buildInputs = - [ - bzip2 - openssl - shared-mime-info - sqlite - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + shared-mime-info + sqlite + xz + zstd + ]; postInstall = let diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index 0bcfd5c58d5f..b5c569a9f01f 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, cacert, nixosTests, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { pname = "redlib"; @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-1zPLnkNZvuZS5z9AEJvhyIv+8/y+YhqFcj5Mu7RSqnE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - postInstall = '' install -D contrib/redlib.service $out/lib/systemd/system/redlib.service substituteInPlace $out/lib/systemd/system/redlib.service \ diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index cedd6767ce95..56ceae80fe14 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -1,11 +1,9 @@ { fetchCrate, lib, - stdenv, openssl, pkg-config, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; meta = with lib; { description = "Run migrations for the Refinery ORM for Rust via the CLI"; diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix index 6b44a65c5030..c9a5cef39e03 100644 --- a/pkgs/by-name/re/reshape/package.nix +++ b/pkgs/by-name/re/reshape/package.nix @@ -2,10 +2,8 @@ lib, rustPlatform, fetchCrate, - darwin, postgresqlTestHook, postgresql, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-lK54SEayI015f2AQ6h4zadgkECLp4jCeJO7enBG0LeM="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - nativeCheckInputs = [ postgresqlTestHook postgresql diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix index 0333ab8f71b3..7cfba5fae808 100644 --- a/pkgs/by-name/re/restic-browser/package.nix +++ b/pkgs/by-name/re/restic-browser/package.nix @@ -11,7 +11,6 @@ wrapGAppsHook3, webkitgtk_4_0, dbus, - darwin, nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -46,17 +45,10 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - webkitgtk_4_0 - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - WebKit - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + webkitgtk_4_0 + dbus + ]; cargoRoot = "src-tauri"; buildAndTestSubdir = cargoRoot; diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix index 153e083f313c..4a849ef4ed27 100644 --- a/pkgs/by-name/re/restish/package.nix +++ b/pkgs/by-name/re/restish/package.nix @@ -2,7 +2,6 @@ lib, stdenv, buildGoModule, - darwin, fetchFromGitHub, restish, testers, @@ -22,18 +21,13 @@ buildGoModule rec { vendorHash = "sha256-qeArar0WnMACUnKBlC+PcFeJPzofwbK440A4M/rQ04U="; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Kernel - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXrandr + ]; ldflags = [ "-s" diff --git a/pkgs/by-name/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix index 5e87c9104bea..86d3063460d5 100644 --- a/pkgs/by-name/re/rewrk/package.nix +++ b/pkgs/by-name/re/rewrk/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "More modern http framework benchmarker supporting HTTP/1 and HTTP/2 benchmarks"; homepage = "https://github.com/lnx-search/rewrk"; diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix index 944baa2255ca..63a7972968cb 100644 --- a/pkgs/by-name/ri/riff/package.nix +++ b/pkgs/by-name/ri/riff/package.nix @@ -5,8 +5,6 @@ makeWrapper, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,13 +26,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; postInstall = '' wrapProgram $out/bin/riff --set-default RIFF_DISABLE_TELEMETRY true diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index a92406128c93..7fabba7fa204 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, - darwin, pkg-config, testers, fetchzip, @@ -25,15 +23,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-lhStxg8H2T29eFYDFAZhFjOyH4hfRwEmcewm7Ec/oTw="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; checkFlags = [ diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 20181d00888f..7a8fcf29f44f 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -5,12 +5,8 @@ rustPlatform, pkg-config, openssl, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; -in rustPlatform.buildRustPackage rec { pname = "rojo"; version = "7.4.4"; @@ -30,14 +26,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - SystemConfiguration - ]; + buildInputs = [ + openssl + ]; # reqwest's native-tls-vendored feature flag uses vendored openssl. this disables that OPENSSL_NO_VENDOR = "1"; diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index c9e5437b32d2..b394ddc6d0e4 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nixosTests, }: @@ -21,14 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-58EnGouq8iKkgsvyHqARoQ0u4QXjw0m6pv4Am4J9wlU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - meta = with lib; { description = "RPKI Validator written in Rust"; homepage = "https://github.com/NLnetLabs/routinator"; diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix index 1a66700b17d9..1aad60b8ec24 100644 --- a/pkgs/by-name/rr/rrdtool/package.nix +++ b/pkgs/by-name/rr/rrdtool/package.nix @@ -12,7 +12,6 @@ cairo, groff, tcl, - darwin, }: perl.pkgs.toPerlModule ( @@ -49,7 +48,6 @@ perl.pkgs.toPerlModule ( ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl - darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' diff --git a/pkgs/by-name/rt/rtaudio_6/package.nix b/pkgs/by-name/rt/rtaudio_6/package.nix index b57810ba7e15..b1da7ea2825a 100644 --- a/pkgs/by-name/rt/rtaudio_6/package.nix +++ b/pkgs/by-name/rt/rtaudio_6/package.nix @@ -13,7 +13,6 @@ jackSupport ? true, libjack2, coreaudioSupport ? stdenv.hostPlatform.isDarwin, - darwin, validatePkgConfig, }: @@ -45,9 +44,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals jackSupport [ libjack2 - ] - ++ lib.optionals coreaudioSupport [ - darwin.apple_sdk.frameworks.CoreAudio ]; cmakeFlags = [ diff --git a/pkgs/by-name/rt/rtz/package.nix b/pkgs/by-name/rt/rtz/package.nix index 51ed10eababb..3dd5f8d13335 100644 --- a/pkgs/by-name/rt/rtz/package.nix +++ b/pkgs/by-name/rt/rtz/package.nix @@ -6,8 +6,6 @@ bzip2, openssl, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,16 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + zstd + ]; buildFeatures = [ "web" ]; diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index 684bb97a1709..f64817adec84 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -12,7 +12,6 @@ ladspaH, meson, ninja, - darwin, }: stdenv.mkDerivation rec { @@ -30,23 +29,14 @@ stdenv.mkDerivation rec { ninja jdk_headless ]; - buildInputs = - [ - libsamplerate - libsndfile - fftw - vamp-plugin-sdk - ladspaH - lv2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreGraphics - CoreVideo - ] - ); + buildInputs = [ + libsamplerate + libsndfile + fftw + vamp-plugin-sdk + ladspaH + lv2 + ]; makeFlags = [ "AR:=$(AR)" ]; # TODO: package boost-test, so we can run the test suite. (Currently it fails diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 7330bb888093..051eb271e705 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -7,7 +7,6 @@ jre_minimal, pkg-config, wrapGAppsHook3, - darwin, alsa-lib, gtk3, openssl, @@ -56,16 +55,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenvNoCC.hostPlatform.isLinux [ - alsa-lib - gtk3 - openssl - wayland - vulkan-loader - udev - ] - ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ + alsa-lib + gtk3 + openssl + wayland + vulkan-loader + udev + ]; postInstall = '' diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix index 35316fdc68a6..750b5a897dd9 100644 --- a/pkgs/by-name/ru/rune-languageserver/package.nix +++ b/pkgs/by-name/ru/rune-languageserver/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-YviRACndc4r4ul72ZF3I/R/nEsIoML2Ek2xqUUE3FDQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - env = { RUNE_VERSION = version; }; diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix index 8f962d69c6f5..61915b6e9801 100644 --- a/pkgs/by-name/ru/rune/package.nix +++ b/pkgs/by-name/ru/rune/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,11 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-SgfgoMqr2Cc7+qhf9Ejl4Ect1JR9RqI9I0b+PrdvdOs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - env = { RUNE_VERSION = version; }; diff --git a/pkgs/by-name/ru/runiq/package.nix b/pkgs/by-name/ru/runiq/package.nix index 198d3041a849..85cd0995f1f5 100644 --- a/pkgs/by-name/ru/runiq/package.nix +++ b/pkgs/by-name/ru/runiq/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Efficient way to filter duplicate lines from input, à la uniq"; mainProgram = "runiq"; diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index 9e8a971f81a1..d3ac271a2a62 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, # Build runit-init as a static binary static ? false, @@ -30,12 +29,10 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = - lib.optionals static [ - stdenv.cc.libc - stdenv.cc.libc.static - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; + buildInputs = lib.optionals static [ + stdenv.cc.libc + stdenv.cc.libc.static + ]; postPatch = '' diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix index a90b0628dcac..73ba1fa99527 100644 --- a/pkgs/by-name/ru/russ/package.nix +++ b/pkgs/by-name/ru/russ/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage { @@ -23,14 +21,6 @@ rustPlatform.buildRustPackage { # tests are network based :( doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - AppKit - ] - ); - meta = { changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md"; description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus"; diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix index a5d80ba81433..d969e4023c44 100644 --- a/pkgs/by-name/ru/rust-traverse/package.nix +++ b/pkgs/by-name/ru/rust-traverse/package.nix @@ -5,8 +5,6 @@ pkg-config, bzip2, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Foundation - ]; + buildInputs = [ + bzip2 + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ru/rustcat/package.nix b/pkgs/by-name/ru/rustcat/package.nix index 47c78d76b292..0d6d73f63266 100644 --- a/pkgs/by-name/ru/rustcat/package.nix +++ b/pkgs/by-name/ru/rustcat/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-76/JK9IKYD6mxMddUyTgKAw53GM4EUhC0NbKFKdg8CI="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix index 9f15d8a80ba0..b561f3525b2d 100644 --- a/pkgs/by-name/ru/rustdesk-server/package.nix +++ b/pkgs/by-name/ru/rustdesk-server/package.nix @@ -1,11 +1,9 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, libsodium, - Security, sqlite, nix-update-script, testers, @@ -41,14 +39,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libsodium - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + libsodium + sqlite + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index 67e4eaf6a680..d7da3b26e7d3 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -29,7 +29,6 @@ zlib, zstd, stdenv, - darwin, alsa-lib, makeDesktopItem, copyDesktopItems, @@ -144,19 +143,7 @@ rustPlatform.buildRustPackage (finalAttrs: { zlib zstd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreAudio - CoreFoundation - CoreGraphics - Foundation - IOKit - Security - SystemConfiguration - ] - ) + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xdotool diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix index 96cbda420d44..a706c00408be 100644 --- a/pkgs/by-name/ru/rusti-cal/package.nix +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-9nd8xm3jAFouRYKSFpx3vQQaI/2wQzTaaehXjqljIfw="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - meta = with lib; { description = "Minimal command line calendar, similar to cal"; mainProgram = "rusti-cal"; diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index 1b2b632438ab..ea400d9b6ce3 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -2,9 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - stdenv, - Security, - SystemConfiguration, installShellFiles, nix-update-script, }: @@ -25,11 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - postInstall = '' for shell in {ba,fi,z}sh; do $out/bin/rustic completions $shell > rustic.$shell diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix index 5c3f1549df0c..136cddb89013 100644 --- a/pkgs/by-name/ru/rustlings/package.nix +++ b/pkgs/by-name/ru/rustlings/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, pkg-config, @@ -38,10 +36,6 @@ rustPlatform.buildRustPackage { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ CoreServices ] - ); - postFixup = '' wrapProgram $out/bin/rustlings --suffix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 61bbb514cc75..b0a1935d8803 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -8,7 +8,6 @@ validatePkgConfig, rust, libiconv, - darwin, curl, apacheHttpd, testers, @@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix index a87e24b16802..932876025231 100644 --- a/pkgs/by-name/ru/rustmission/package.nix +++ b/pkgs/by-name/ru/rustmission/package.nix @@ -4,8 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; # There is no tests doCheck = false; diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix index 2d6e9126502c..647f86a3d7c7 100644 --- a/pkgs/by-name/ru/rustus/package.nix +++ b/pkgs/by-name/ru/rustus/package.nix @@ -1,12 +1,10 @@ { - stdenv, lib, fetchFromGitHub, rustPlatform, nix-update-script, pkg-config, openssl, - darwin, rdkafka, }: @@ -36,14 +34,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - openssl - rdkafka - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + rdkafka + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix index 5e7c9d6a7e5f..337bd547c497 100644 --- a/pkgs/by-name/ru/rustycli/package.nix +++ b/pkgs/by-name/ru/rustycli/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-QjkUiPwjG25NsvAXM3jqQVtJzYiXhzVqFaDN1b7DXDE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # some examples fail to compile cargoTestFlags = [ "--tests" ]; diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix index a19879a1d41c..6ed96164be17 100644 --- a/pkgs/by-name/ru/rustypaste-cli/package.nix +++ b/pkgs/by-name/ru/rustypaste-cli/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-R6mdHoARtnIRpN18KF1TVIgBzEtCinb0xfCM3nz2sxk="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "CLI tool for rustypaste"; homepage = "https://github.com/orhun/rustypaste-cli"; diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix index 9548360b2f22..c97756291304 100644 --- a/pkgs/by-name/ru/rustypaste/package.nix +++ b/pkgs/by-name/ru/rustypaste/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-10tBbn4XtdUNhfzb+KpwFGZAc7YVIEQRaqNLzJC1GGI="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - dontUseCargoParallelTests = true; checkFlags = [ diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix index b0b5bbf2b2e9..72e4d59d6ea7 100644 --- a/pkgs/by-name/ru/rustywind/package.nix +++ b/pkgs/by-name/ru/rustywind/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-jq8d+ndPOu07YO5PJ5YfWTeG70bZnr0i8vMwv7Dw5GY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "CLI for organizing Tailwind CSS classes"; mainProgram = "rustywind"; diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index 31756bdf7d66..db379c5c85e1 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, xorg, }: @@ -21,13 +20,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-/AnzUaya+dgckcilxj9ZZbDNqmfj1uTWkzhVphpZIsM="; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libxcb - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libxcb + ]; checkFlags = [ # skip flaky test diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 011c1929df58..9bd9fa33a41b 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -20,7 +20,6 @@ vigra, pdal, libpq, - darwin, unixODBC, poppler, hdf5, @@ -80,7 +79,6 @@ stdenv.mkDerivation rec { # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa unixODBC poppler netcdf diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix index e7bfd4246292..8d2e0bb7b656 100644 --- a/pkgs/by-name/sa/sagoin/package.nix +++ b/pkgs/by-name/sa/sagoin/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - postInstall = '' installManPage artifacts/sagoin.1 installShellCompletion artifacts/sagoin.{bash,fish} --zsh artifacts/_sagoin diff --git a/pkgs/by-name/sa/sampler/package.nix b/pkgs/by-name/sa/sampler/package.nix index ec2e35728b1c..1f1f993d4915 100644 --- a/pkgs/by-name/sa/sampler/package.nix +++ b/pkgs/by-name/sa/sampler/package.nix @@ -3,7 +3,6 @@ buildGoModule, fetchFromGitHub, fetchpatch, - darwin, alsa-lib, stdenv, }: @@ -33,11 +32,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = - lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenAL - ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib; meta = with lib; { description = "Tool for shell commands execution, visualization and alerting"; diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index b0fba4887cd4..1c6d2f8a4db3 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, versionCheckHook, nix-update-script, }: @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-mQykzO9Ldokd3PZ1fY4pK/GtLmYMVas2iHj1Pqi9WqQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; doInstallCheck = true; diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix index f5e89c173587..04a95c7e1bdd 100644 --- a/pkgs/by-name/sc/sccache/package.nix +++ b/pkgs/by-name/sc/sccache/package.nix @@ -4,8 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,14 +23,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; # Tests fail because of client server setup which is not possible inside the # pure environment, see https://github.com/mozilla/sccache/issues/460 diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix index 7705bd0d0746..d148bfe1123a 100644 --- a/pkgs/by-name/sc/schemamap/package.nix +++ b/pkgs/by-name/sc/schemamap/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - darwin, }: let @@ -27,17 +25,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8UmLAT7Etb9MARoGhvOHPhkdR/8jCEAjAK/mWRHL9hk="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; - [ - frameworks.Security - frameworks.CoreFoundation - frameworks.CoreServices - frameworks.SystemConfiguration - ] - ); + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index 191cfa461cfd..226000e3902c 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -1,12 +1,10 @@ { - darwin, fetchFromGitHub, lib, perl, pkg-config, openssl, rustPlatform, - stdenv, nix-update-script, }: @@ -29,14 +27,7 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 3a7274f7af72..261e830134af 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,11 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; CARGO_FEATURE_USE_SYSTEM_LIBS = true; diff --git a/pkgs/by-name/sd/SDL2_classic/package.nix b/pkgs/by-name/sd/SDL2_classic/package.nix index 95a8c1ebf0bf..e13b70c3a98d 100644 --- a/pkgs/by-name/sd/SDL2_classic/package.nix +++ b/pkgs/by-name/sd/SDL2_classic/package.nix @@ -43,12 +43,6 @@ pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio, - AudioUnit, - Cocoa, - CoreAudio, - CoreServices, - ForceFeedback, - OpenGL, audiofile, libiconv, withStatic ? stdenv.hostPlatform.isMinGW, @@ -154,15 +148,7 @@ stdenv.mkDerivation (finalAttrs: { [ libiconv ] ++ finalAttrs.dlopenBuildInputs ++ lib.optional ibusSupport ibus - ++ lib.optionals waylandSupport [ wayland-protocols ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioUnit - Cocoa - CoreAudio - CoreServices - ForceFeedback - OpenGL - ]; + ++ lib.optionals waylandSupport [ wayland-protocols ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 6cc9acbeb174..68d0b8850c0d 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -2,7 +2,6 @@ lib, SDL2, autoreconfHook, - darwin, fetchurl, giflib, libXpm, @@ -18,9 +17,6 @@ enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: -let - inherit (darwin.apple_sdk.frameworks) Foundation; -in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_image"; version = "2.8.8"; @@ -45,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + ]; configureFlags = [ diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix index 440a7f35ca8b..5c5ed84f87e8 100644 --- a/pkgs/by-name/sd/SDL2_mixer/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -1,7 +1,6 @@ { lib, SDL2, - darwin, fetchFromGitHub, flac, fluidsynth, @@ -19,9 +18,6 @@ enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: -let - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; -in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_mixer"; version = "2.8.1"; @@ -38,12 +34,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - AudioUnit - CoreServices - ]; - propagatedBuildInputs = [ SDL2 flac diff --git a/pkgs/by-name/sd/SDL2_sound/package.nix b/pkgs/by-name/sd/SDL2_sound/package.nix index 9ec2ec4e3cff..19fb33b41129 100644 --- a/pkgs/by-name/sd/SDL2_sound/package.nix +++ b/pkgs/by-name/sd/SDL2_sound/package.nix @@ -9,15 +9,8 @@ libmikmod, libvorbis, timidity, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) - AudioToolbox - CoreAudio - ; -in stdenv.mkDerivation rec { pname = "SDL2_sound"; version = "2.0.1"; @@ -42,18 +35,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSDLSOUND_DECODER_MIDI=1" ]; - buildInputs = - [ - SDL2 - flac - libmikmod - libvorbis - timidity - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - CoreAudio - ]; + buildInputs = [ + SDL2 + flac + libmikmod + libvorbis + timidity + ]; meta = with lib; { description = "SDL2 sound library"; diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index bdc63084a87e..cd4a241cafbf 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -17,7 +17,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin) autoSignDarwinBinariesHook; in stdenv.mkDerivation (finalAttrs: { @@ -50,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Cocoa ] ++ lib.optionals openglSupport [ libGLU ]; diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index cf9a89d5a125..772c7b52d399 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -1,7 +1,6 @@ { lib, sdl3, - darwin, libavif, libtiff, libwebp, @@ -44,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp libavif - ] ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation); + ]; cmakeFlags = [ # fail when a dependency could not be found diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix index 31bf523f7900..c488e4b816ff 100644 --- a/pkgs/by-name/se/selene/package.nix +++ b/pkgs/by-name/se/selene/package.nix @@ -5,8 +5,6 @@ robloxSupport ? true, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals robloxSupport [ - openssl - ] - ++ lib.optionals (robloxSupport && stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals robloxSupport [ + openssl + ]; buildNoDefaultFeatures = !robloxSupport; diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 02ce397ea19a..15f5b3ff4960 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,10 +24,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-MgnmEJif4Z4CcmBFkC5BJR67DMGm1ttObtl4LhAFw4g="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - # TODO: enable tests # The test suite depends on a number of browsers and network requests, # check the Gentoo package for inspiration diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index bc68f58f9745..432265d65ac7 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,13 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8Ry3rpGTNcvMIA3Q10Cb3uJHOBQin9AhlLNRekaKw/0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); - meta = with lib; { description = "Tool to send files and directories, based on iroh"; homepage = "https://iroh.computer/sendme"; diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 9f239af4f2f9..5d8084732036 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -1,8 +1,6 @@ { - stdenv, fetchFromGitLab, lib, - darwin, nettle, nix-update-script, rustPlatform, @@ -35,19 +33,11 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; - buildInputs = - [ - openssl - sqlite - nettle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ + openssl + sqlite + nettle + ]; # Needed for tests to be able to create a ~/.local/share/sequoia directory # Needed for avoiding "OpenSSL error" since 1.2.0 diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix index b9aaf9dc9a92..d949f6743ca0 100644 --- a/pkgs/by-name/se/sequoia-wot/package.nix +++ b/pkgs/by-name/se/sequoia-wot/package.nix @@ -8,7 +8,6 @@ nettle, openssl, sqlite, - darwin, gnupg, }: rustPlatform.buildRustPackage rec { @@ -36,10 +35,6 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - # See comment near sequoia-openpgp/crypto- buildFeatures - ] ++ lib.optionals (!stdenv.targetPlatform.isWindows) [ nettle ]; diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 4f6840a43f06..5afc9a7aae1d 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, testers, gitMinimal, serie, @@ -23,14 +21,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-+5mUMB4rqLePimfgWlV7UP8B1lPoKzfWCXBBN1q2WIU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreGraphics - AppKit - ] - ); - nativeCheckInputs = [ gitMinimal ]; passthru.tests.version = testers.testVersion { package = serie; }; diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix index 961c6ca606bc..8c375f91e3a3 100644 --- a/pkgs/by-name/sh/share-preview/package.nix +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -12,7 +12,6 @@ desktop-file-utils, libadwaita, openssl, - darwin, nix-update-script, }: @@ -44,15 +43,10 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils ]; - buildInputs = - [ - libadwaita - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libadwaita + openssl + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ] diff --git a/pkgs/by-name/sh/shibboleth-sp/package.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix index 4a300718c737..8f1950d375ef 100644 --- a/pkgs/by-name/sh/shibboleth-sp/package.nix +++ b/pkgs/by-name/sh/shibboleth-sp/package.nix @@ -12,7 +12,6 @@ xercesc, xml-security-c, xml-tooling-c, - darwin, }: stdenv.mkDerivation rec { @@ -29,24 +28,16 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config ]; - buildInputs = - [ - boost - fcgi - openssl - opensaml-cpp - log4shib - xercesc - xml-security-c - xml-tooling-c - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + boost + fcgi + openssl + opensaml-cpp + log4shib + xercesc + xml-security-c + xml-tooling-c + ]; configureFlags = [ "--without-apxs" diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix index d58b91f080ad..0e1d20f3e69e 100644 --- a/pkgs/by-name/sh/shotcut/package.nix +++ b/pkgs/by-name/sh/shotcut/package.nix @@ -13,7 +13,6 @@ fftw, qt6, cmake, - darwin, gitUpdater, ffmpeg, }: @@ -47,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtmultimedia qt6.qtcharts qt6.qtwayland - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ]; env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE"; diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix index 9fbf5ac29326..9d3444805172 100644 --- a/pkgs/by-name/si/silicon/package.nix +++ b/pkgs/by-name/si/silicon/package.nix @@ -10,7 +10,6 @@ libxcb, python3, libiconv, - darwin, fira-code, fontconfig, harfbuzz, @@ -39,15 +38,9 @@ rustPlatform.buildRustPackage rec { harfbuzz ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - libiconv - AppKit - CoreText - Security - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix index d13c5485db55..66e8bbcdc790 100644 --- a/pkgs/by-name/si/simple-http-server/package.nix +++ b/pkgs/by-name/si/simple-http-server/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,11 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index 001996294a8d..4bbbebe1da18 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -10,14 +10,7 @@ xorg, libxkbcommon, wayland, - # Darwin Frameworks - AppKit, - CoreGraphics, - CoreServices, - CoreText, - Foundation, libiconv, - OpenGL, }: let @@ -56,13 +49,7 @@ rustPlatform.buildRustPackage rec { rpathLibs ++ [ xorg.libxcb.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - CoreServices - CoreText - Foundation libiconv - OpenGL ]; # Tests requires `i_slint_backend_testing` which is only a dev dependency diff --git a/pkgs/by-name/sl/slippy/package.nix b/pkgs/by-name/sl/slippy/package.nix index 70e757d7c1a1..c50ce43067eb 100644 --- a/pkgs/by-name/sl/slippy/package.nix +++ b/pkgs/by-name/sl/slippy/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Markdown slideshows in Rust"; diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix index 14b538ece5ae..71b74b20e646 100644 --- a/pkgs/by-name/sl/slowlorust/package.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -27,8 +25,6 @@ rustPlatform.buildRustPackage rec { --replace-fail 'version = "1.0"' 'version = "${version}"' ''; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 45eae21acf3b..adb434620a72 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, }: @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-4RDnIWr0Z6FGnUQxh+yk7L/mg/Jw6JROns4DXkYIbuE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - meta = with lib; { description = "Terminal-based HTTP/REST client"; homepage = "https://slumber.lucaspickering.me"; diff --git a/pkgs/by-name/sm/smartcat/package.nix b/pkgs/by-name/sm/smartcat/package.nix index a06d2d8b151a..77f38f36f665 100644 --- a/pkgs/by-name/sm/smartcat/package.nix +++ b/pkgs/by-name/sm/smartcat/package.nix @@ -3,10 +3,8 @@ fetchFromGitHub, rustPlatform, - darwin, openssl, pkg-config, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -27,15 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = { description = "Integrate large language models into the command line"; diff --git a/pkgs/by-name/sm/smc-fuzzer/package.nix b/pkgs/by-name/sm/smc-fuzzer/package.nix index 7d10da09bed5..255182141c8d 100644 --- a/pkgs/by-name/sm/smc-fuzzer/package.nix +++ b/pkgs/by-name/sm/smc-fuzzer/package.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { hash = "sha256-FyiFSVeO46UnBrpC8AhSuGe7alo37pT8J1qQWGPqV2U="; }; - buildInputs = [ swiftPackages.apple_sdk.frameworks.AppKit ]; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 98e03da7a41d..60e876a69e43 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -37,9 +37,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Security ]; # One of the dependencies (chrootable-https) tries to read "/etc/resolv.conf" diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index 7f64f2fe7e1a..f8d82b213b31 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -13,7 +13,6 @@ vulkan-loader, wayland, xorg, - darwin, }: rustPlatform.buildRustPackage rec { @@ -48,7 +47,6 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index df39145c5973..ad1150c4b03e 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -1,6 +1,5 @@ { lib, - darwin, fetchFromGitHub, libiconv, openssl, @@ -11,7 +10,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; self = rustPlatform.buildRustPackage { pname = "so"; version = "0.4.10"; @@ -34,9 +32,6 @@ let [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreServices - Security - SystemConfiguration ]; strictDeps = true; diff --git a/pkgs/by-name/so/soapyplutosdr/package.nix b/pkgs/by-name/so/soapyplutosdr/package.nix index 07e4fda8cc76..9efdb7348274 100644 --- a/pkgs/by-name/so/soapyplutosdr/package.nix +++ b/pkgs/by-name/so/soapyplutosdr/package.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation (finalAttrs: { soapysdr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.IOKit darwin.libobjc ]; diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index c1faaafceb28..719ff9529829 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, lib, rustPlatform, - darwin, udev, protobuf, libcxx, @@ -42,14 +41,6 @@ let version = "1.18.26"; hash = "sha256-sJ0Zn5GMi64/S8zqomL/dYRVW8SOQWsP+bpcdatJC0A="; rocksdb = rocksdb_8_3; - - inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) - System - IOKit - AppKit - Security - ; in rustPlatform.buildRustPackage rec { pname = "solana-cli"; @@ -100,11 +91,6 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libcxx - IOKit - Security - AppKit - System - Libsystem ]; doInstallCheck = true; diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index cd8a5bae52ca..a14e5f750236 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - darwin, protobuf, nix-update-script, testers, @@ -26,8 +25,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - doCheck = false; passthru = { diff --git a/pkgs/by-name/sp/speedtest-rs/package.nix b/pkgs/by-name/sp/speedtest-rs/package.nix index c28c1c8f52eb..e5d5b402b826 100644 --- a/pkgs/by-name/sp/speedtest-rs/package.nix +++ b/pkgs/by-name/sp/speedtest-rs/package.nix @@ -5,7 +5,6 @@ openssl, pkg-config, stdenv, - darwin, nix-update-script, testers, speedtest-rs, @@ -22,12 +21,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1FAFYiWDD/KG/7/UTv/EW6Nj2GnU0GZFFq6ouMc0URA="; }; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix index 1624d07f80aa..d0e0d18282d5 100644 --- a/pkgs/by-name/sq/sql-studio/package.nix +++ b/pkgs/by-name/sq/sql-studio/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, buildNpmPackage, fetchFromGitHub, @@ -38,8 +36,6 @@ rustPlatform.buildRustPackage { cp -pr --reflink=auto -- ${ui} ui/dist ''; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - meta = { description = "SQL Database Explorer [SQLite, libSQL, PostgreSQL, MySQL/MariaDB, ClickHouse, Microsoft SQL Server]"; homepage = "https://github.com/frectonz/sql-studio"; diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix index f7934b44ebf8..b6812fe601a4 100644 --- a/pkgs/by-name/sq/sqld/package.nix +++ b/pkgs/by-name/sq/sqld/package.nix @@ -8,8 +8,6 @@ openssl, sqlite, zstd, - stdenv, - darwin, cmake, nix-update-script, @@ -56,7 +54,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite zstd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; env.ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index 3d34a3dc0547..f497f538e290 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, rust-jemalloc-sys, nix-update-script, versionCheckHook, @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ]; # Patch the tests to find the binary postPatch = '' diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index 66065fd74588..1496229ad9e8 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, lib, libiconv, @@ -29,18 +28,10 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ - libiconv - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - ] - ); + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libiconv + openssl + ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix index b2b403461222..8980661212e7 100644 --- a/pkgs/by-name/sq/squeezelite/package.nix +++ b/pkgs/by-name/sq/squeezelite/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchFromGitHub, flac, libgpiod, @@ -59,17 +58,7 @@ stdenv.mkDerivation { ++ optional pulseSupport libpulseaudio ++ optional alsaSupport alsa-lib ++ optional portaudioSupport portaudio - ++ optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - CoreVideo - VideoDecodeAcceleration - CoreAudio - AudioToolbox - AudioUnit - Carbon - ] - ) + ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 3057f97ad5ae..f80017b8c57c 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, xorg, - darwin, testers, src-cli, }: @@ -26,13 +25,9 @@ buildGoModule rec { "cmd/src" ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libX11 + ]; ldflags = [ "-s" diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index 6de2efdc2821..b5a5ff2c8282 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -11,8 +11,6 @@ nettle, openssl, sqlite, - stdenv, - darwin, openssh, # Arguments not supplied by callPackage pname, @@ -60,18 +58,11 @@ rustPlatform.buildRustPackage { --zsh shell_completions/_${pname} ''; - buildInputs = - [ - nettle - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.IOKit - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration - ]; + buildInputs = [ + nettle + openssl + sqlite + ]; doCheck = true; nativeCheckInputs = [ diff --git a/pkgs/by-name/st/stabber/package.nix b/pkgs/by-name/st/stabber/package.nix index a2d3a8c6587e..5c269a2e8606 100644 --- a/pkgs/by-name/st/stabber/package.nix +++ b/pkgs/by-name/st/stabber/package.nix @@ -7,7 +7,6 @@ glib, expat, libmicrohttpd, - darwin, }: stdenv.mkDerivation { pname = "stabber-unstable"; @@ -37,7 +36,7 @@ stdenv.mkDerivation { glib expat libmicrohttpd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; meta = with lib; { description = "Stubbed XMPP Server"; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 65cbec0134c5..9b6675c2b09c 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -10,7 +10,6 @@ foundationdb, zstd, stdenv, - darwin, nix-update-script, nixosTests, rocksdb, @@ -37,19 +36,12 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - bzip2 - openssl - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ foundationdb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + sqlite + zstd + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ foundationdb ]; # Issue: https://github.com/stalwartlabs/mail-server/issues/1104 buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix index bf082e1b358f..8701b9450836 100644 --- a/pkgs/by-name/st/star-history/package.nix +++ b/pkgs/by-name/st/star-history/package.nix @@ -1,11 +1,9 @@ { lib, rustPlatform, - darwin, fetchCrate, pkg-config, openssl, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -22,11 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; meta = with lib; { description = "Command line program to generate a graph showing number of GitHub stars of a user, org or repo over time"; diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix index 244d19a3eed8..c51dc81506e3 100644 --- a/pkgs/by-name/st/starry/package.nix +++ b/pkgs/by-name/st/starry/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Current stars history tells only half the story"; diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix index f31a7d1ccbec..83f1cb8cb49d 100644 --- a/pkgs/by-name/st/static-web-server/package.nix +++ b/pkgs/by-name/st/static-web-server/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nixosTests, }: @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Sri2NTCN5vIf/5KVI+BtyOBAjkXoGpOJjP2iOh/M5NU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00 preCheck = '' find docker/public -exec touch -m {} \; diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix index 92763dd75952..d0a241f2606c 100644 --- a/pkgs/by-name/st/step-ca/package.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -8,7 +8,6 @@ pkg-config, hsmSupport ? true, nixosTests, - darwin, }: buildGoModule rec { @@ -31,9 +30,7 @@ buildGoModule rec { nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; - buildInputs = - lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ] - ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.PCSC ]; + buildInputs = lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ]; postPatch = '' substituteInPlace authority/http_client_test.go --replace-fail 't.Run("SystemCertPool", func(t *testing.T) {' 't.Skip("SystemCertPool", func(t *testing.T) {' substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill" diff --git a/pkgs/by-name/st/stormlib/package.nix b/pkgs/by-name/st/stormlib/package.nix index f7cd1b2b55d5..55b1badd1c83 100644 --- a/pkgs/by-name/st/stormlib/package.nix +++ b/pkgs/by-name/st/stormlib/package.nix @@ -3,7 +3,6 @@ stdenv, bzip2, cmake, - darwin, fetchFromGitHub, libtomcrypt, zlib, @@ -26,15 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - bzip2 - libtomcrypt - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Carbon - ]; + buildInputs = [ + bzip2 + libtomcrypt + zlib + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix index c014a2080be4..48c8c18b5676 100644 --- a/pkgs/by-name/st/strongswan/package.nix +++ b/pkgs/by-name/st/strongswan/package.nix @@ -28,7 +28,6 @@ tpm2-tss, enableNetworkManager ? false, networkmanager, - darwin, nixosTests, }: @@ -78,9 +77,6 @@ stdenv.mkDerivation rec { pam iptables ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ SystemConfiguration ] - ) ++ lib.optionals enableNetworkManager [ networkmanager glib diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index 53969233d425..1976b966ebf3 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, cmake, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,10 +28,6 @@ rustPlatform.buildRustPackage rec { # Needed by wabt-sys nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # Requires a running substrate node doCheck = false; diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 4af8cecaf004..da901591c0a0 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -13,7 +13,6 @@ libxkbcommon, libglvnd, mpv-unwrapped, - darwin, waylandSupport ? false, }: @@ -64,13 +63,6 @@ buildGoModule rec { wayland wayland-protocols libxkbcommon - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.Kernel - darwin.apple_sdk_11_0.frameworks.OpenGL - darwin.apple_sdk_11_0.frameworks.UserNotifications - darwin.apple_sdk_11_0.frameworks.MediaPlayer ]; postInstall = diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix index 8cffcf7dd82d..bf145ff65ea4 100644 --- a/pkgs/by-name/su/surfer/package.nix +++ b/pkgs/by-name/su/surfer/package.nix @@ -12,7 +12,6 @@ libXcursor, libXi, stdenv, - darwin, makeWrapper, zenity, }: @@ -34,12 +33,10 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - (lib.getLib stdenv.cc.cc) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + (lib.getLib stdenv.cc.cc) + ]; # Wayland and X11 libs are required at runtime since winit uses dlopen runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 45140d977307..1f766445a6bc 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -8,7 +7,6 @@ rocksdb, testers, surrealdb, - darwin, protobuf, }: rustPlatform.buildRustPackage rec { @@ -45,7 +43,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; doCheck = false; diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 0903acf482e7..94ce548bf251 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -6,7 +6,6 @@ openssl, protobuf, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,16 +26,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - protobuf - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + protobuf + ]; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix index bf8d01099dab..448d972eaa9d 100644 --- a/pkgs/by-name/sw/swim/package.nix +++ b/pkgs/by-name/sw/swim/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, spade, - stdenv, - darwin, git, }: @@ -35,14 +33,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/sw/switcheroo/package.nix b/pkgs/by-name/sw/switcheroo/package.nix index 601e2c322bde..dc2ac68cb485 100644 --- a/pkgs/by-name/sw/switcheroo/package.nix +++ b/pkgs/by-name/sw/switcheroo/package.nix @@ -2,7 +2,6 @@ lib, blueprint-compiler, cargo, - darwin, desktop-file-utils, fetchFromGitLab, glib, @@ -48,15 +47,11 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; - buildInputs = - [ - glib - gtk4 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + gtk4 + libadwaita + ]; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix index 4d70b1ee494e..c73dedb13297 100644 --- a/pkgs/by-name/sy/symbolicator/package.nix +++ b/pkgs/by-name/sy/symbolicator/package.nix @@ -6,8 +6,6 @@ bzip2, openssl, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,16 +28,11 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - bzip2 - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + zstd + ]; env = { SYMBOLICATOR_GIT_VERSION = src.rev; diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix index 3d5cee8a5931..c8dfde12d0c5 100644 --- a/pkgs/by-name/sy/synfigstudio/package.nix +++ b/pkgs/by-name/sy/synfigstudio/package.nix @@ -8,7 +8,6 @@ boost, cairo, - darwin, gettext, glibmm, gtk3, @@ -77,26 +76,22 @@ let gettext intltool ]; - buildInputs = - [ - ETL - boost - cairo - glibmm - mlt - libsigcxx - libxmlxx - pango - imagemagick - harfbuzz - freetype - fribidi - openexr - fftw - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + ETL + boost + cairo + glibmm + mlt + libsigcxx + libxmlxx + pango + imagemagick + harfbuzz + freetype + fribidi + openexr + fftw + ]; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/sz/szyszka/package.nix b/pkgs/by-name/sz/szyszka/package.nix index 97cb882bff2c..17a9a6b342ee 100644 --- a/pkgs/by-name/sz/szyszka/package.nix +++ b/pkgs/by-name/sz/szyszka/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -11,7 +10,6 @@ gdk-pixbuf, gtk4, wrapGAppsHook4, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,21 +31,14 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook4 ]; - buildInputs = - [ - glib - cairo - pango - atk - gdk-pixbuf - gtk4 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Foundation - ] - ); + buildInputs = [ + glib + cairo + pango + atk + gdk-pixbuf + gtk4 + ]; postInstall = '' install -m 444 \ diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix index 3001f15a4a94..db83909fdb52 100644 --- a/pkgs/by-name/t-/t-rex/package.nix +++ b/pkgs/by-name/t-/t-rex/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, gdal, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -31,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gdal openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; meta = with lib; { description = "Vector tile server specialized on publishing MVT tiles"; diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix index ac4dbb58a009..5e43f0426b9d 100644 --- a/pkgs/by-name/ta/taizen/package.nix +++ b/pkgs/by-name/ta/taizen/package.nix @@ -6,8 +6,6 @@ pkg-config, ncurses, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -35,14 +33,10 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - ncurses - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + ncurses + openssl + ]; meta = with lib; { description = "curses based mediawiki browser"; diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix index 9d304d75d517..1b42df36c220 100644 --- a/pkgs/by-name/ta/talecast/package.nix +++ b/pkgs/by-name/ta/talecast/package.nix @@ -1,12 +1,10 @@ { lib, fetchCrate, - darwin, rustPlatform, pkg-config, openssl, nix-update-script, - stdenv, testers, talecast, }: @@ -27,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ta/taler-depolymerization/package.nix b/pkgs/by-name/ta/taler-depolymerization/package.nix index 5874223a44f0..06d1920ffeea 100644 --- a/pkgs/by-name/ta/taler-depolymerization/package.nix +++ b/pkgs/by-name/ta/taler-depolymerization/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchgit, - stdenv, - darwin, }: rustPlatform.buildRustPackage { pname = "taler-depolymerization"; @@ -36,15 +34,6 @@ rustPlatform.buildRustPackage { cp docs/*.conf $out/share/examples ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - SystemConfiguration - ] - ); - meta = { description = "Wire gateway for Bitcoin/Ethereum"; homepage = "https://git.taler.net/depolymerization.git/"; diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index e748d95922cc..6e00d8f1c2b3 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, withLsp ? true, }: @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; buildFeatures = lib.optional withLsp "lsp"; diff --git a/pkgs/by-name/te/telepathy-logger/package.nix b/pkgs/by-name/te/telepathy-logger/package.nix index e60aca4e8bf0..90ff154b3d5b 100644 --- a/pkgs/by-name/te/telepathy-logger/package.nix +++ b/pkgs/by-name/te/telepathy-logger/package.nix @@ -15,7 +15,6 @@ gobject-introspection, dbus, fetchpatch, - darwin, }: stdenv.mkDerivation rec { @@ -42,18 +41,13 @@ stdenv.mkDerivation rec { gobject-introspection python3 ]; - buildInputs = - [ - dbus-glib - libxml2 - sqlite - telepathy-glib - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + dbus-glib + libxml2 + sqlite + telepathy-glib + dbus + ]; configureFlags = [ "--enable-call" ]; diff --git a/pkgs/by-name/te/teller/package.nix b/pkgs/by-name/te/teller/package.nix index 1fcdbcd46ff7..f3b6564c1617 100644 --- a/pkgs/by-name/te/teller/package.nix +++ b/pkgs/by-name/te/teller/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, nix-update-script, protobuf, - stdenv, - darwin, pkg-config, openssl, }: @@ -34,7 +32,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; doCheck = false; diff --git a/pkgs/by-name/te/termbook/package.nix b/pkgs/by-name/te/termbook/package.nix index d6b450f6b7de..70b63b9daedd 100644 --- a/pkgs/by-name/te/termbook/package.nix +++ b/pkgs/by-name/te/termbook/package.nix @@ -6,7 +6,6 @@ pkg-config, oniguruma, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,13 +28,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + oniguruma + ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix index 5e752571669e..4f05c970dfcb 100644 --- a/pkgs/by-name/th/the-powder-toy/package.nix +++ b/pkgs/by-name/th/the-powder-toy/package.nix @@ -1,6 +1,5 @@ { bzip2, - Cocoa, copyDesktopItems, curl, fetchFromGitHub, @@ -48,7 +47,7 @@ stdenv.mkDerivation rec { luajit SDL2 zlib - ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ]; mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix index ca41c64a18c3..80adfe234002 100644 --- a/pkgs/by-name/th/the-way/package.nix +++ b/pkgs/by-name/th/the-way/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchCrate, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - useNextest = true; postInstall = '' diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix index 76af2e026e12..d9b682eb2160 100644 --- a/pkgs/by-name/ti/tickrs/package.nix +++ b/pkgs/by-name/ti/tickrs/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ti/tio/package.nix b/pkgs/by-name/ti/tio/package.nix index bb654032f60f..4fdf3dc622da 100644 --- a/pkgs/by-name/ti/tio/package.nix +++ b/pkgs/by-name/ti/tio/package.nix @@ -9,7 +9,6 @@ inih, lua, bash-completion, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -29,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { inih lua glib - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.IOKit ]; + ]; nativeBuildInputs = [ meson diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index a1ff5926d464..87147b7fa4a7 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - postInstall = '' installManPage tldr.1 installShellCompletion completions/{tldr.bash,_tldr,tldr.fish} diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 0a46eeb6575e..42223fba4777 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, oniguruma, - darwin, installShellFiles, tpnote, testers, @@ -32,18 +30,9 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + oniguruma + ]; postInstall = '' installManPage docs/build/man/man1/tpnote.1 diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 5916ac4cca4f..2fcf417165a0 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -9,7 +9,6 @@ wayland-scanner, capstone, - darwin, dbus, freetype, glfw, @@ -68,11 +67,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && !withWayland)) [ glfw - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ] - ++ lib.optionals ( - stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" - ) [ darwin.apple_sdk.frameworks.UniformTypeIdentifiers ]; + ]; cmakeFlags = [ diff --git a/pkgs/by-name/tr/transmission-rss/package.nix b/pkgs/by-name/tr/transmission-rss/package.nix index 1fceafe35b86..e87517d42903 100644 --- a/pkgs/by-name/tr/transmission-rss/package.nix +++ b/pkgs/by-name/tr/transmission-rss/package.nix @@ -1,11 +1,9 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage { @@ -25,15 +23,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-ETbWV5OjRzQuq/rVyu22YRFjeQcuNA1REyzg46s3q5A="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/tr/tre/package.nix b/pkgs/by-name/tr/tre/package.nix index ccfb9d4937c9..268f561fbaf5 100644 --- a/pkgs/by-name/tr/tre/package.nix +++ b/pkgs/by-name/tr/tre/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, autoconf, automake, - darwin, gettext, libiconv, libtool, diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix index 47959e4eddbf..3a865c733f70 100644 --- a/pkgs/by-name/tr/trunk-ng/package.nix +++ b/pkgs/by-name/tr/trunk-ng/package.nix @@ -6,9 +6,6 @@ pkg-config, openssl, libiconv, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -27,9 +24,6 @@ rustPlatform.buildRustPackage rec { if stdenv.hostPlatform.isDarwin then [ libiconv - CoreServices - Security - SystemConfiguration ] else [ openssl ]; diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix index 61414492cff0..31d4e2bc9212 100644 --- a/pkgs/by-name/tt/ttfb/package.nix +++ b/pkgs/by-name/tt/ttfb/package.nix @@ -1,9 +1,7 @@ { - darwin, fetchCrate, lib, rustPlatform, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -15,10 +13,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OOVqCWeF5cHMweEGWYIiWWWsw1QlNDFgnia05Qxo7uo="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-4Nsg5/66enMgAfPrUQHuhOTTwG2OWyyvKMHIhPnlHko="; diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index cf11de57e07f..079e09d45ec9 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,16 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; meta = with lib; { description = "Your journal app if you live in a terminal"; diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix index a0a2150e5189..ee24471c775a 100644 --- a/pkgs/by-name/tw/twitch-hls-client/package.nix +++ b/pkgs/by-name/tw/twitch-hls-client/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Suq+j4/lmkEMg6VlLT8UcPcVjDyBLyjUaqPXdqDo3dU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Minimal CLI client for watching/recording Twitch streams"; homepage = "https://github.com/2bc4/twitch-hls-client.git"; diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix index 1dbb2ea22744..830ceb928b9d 100644 --- a/pkgs/by-name/ty/typst-live/package.nix +++ b/pkgs/by-name/ty/typst-live/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, makeWrapper, typst, }: @@ -24,10 +22,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - postInstall = '' wrapProgram $out/bin/typst-live \ --suffix PATH : ${lib.makeBinPath [ typst ]} diff --git a/pkgs/by-name/ud/udict/package.nix b/pkgs/by-name/ud/udict/package.nix index 881c7b8cb9ba..472834744c5d 100644 --- a/pkgs/by-name/ud/udict/package.nix +++ b/pkgs/by-name/ud/udict/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,14 +28,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Urban Dictionary CLI - written in Rust"; diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix index 056008249f69..1643a90ce1b5 100644 --- a/pkgs/by-name/va/vale-ls/package.nix +++ b/pkgs/by-name/va/vale-ls/package.nix @@ -6,7 +6,6 @@ rustPlatform, pkg-config, openssl, - darwin, vale, }: @@ -27,16 +26,9 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); + buildInputs = [ + openssl + ]; checkFlags = [ diff --git a/pkgs/by-name/vc/vcdimager/package.nix b/pkgs/by-name/vc/vcdimager/package.nix index af77f7532c30..22cc7d2101df 100644 --- a/pkgs/by-name/vc/vcdimager/package.nix +++ b/pkgs/by-name/vc/vcdimager/package.nix @@ -7,7 +7,6 @@ libxml2, popt, libiconv, - darwin, }: stdenv.mkDerivation rec { @@ -21,19 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libxml2 - popt - libiconv - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - IOKit - DiskArbitration - ] - ); + buildInputs = [ + libxml2 + popt + libiconv + ]; propagatedBuildInputs = [ libcdio ]; diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index 8c3340b508a9..906d68d38d48 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -6,7 +6,6 @@ installShellFiles, dbus, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,16 +28,9 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + dbus + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd veryl \ diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index 0c1785e560a6..af787bed0bb0 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -13,9 +13,7 @@ buildPackages, # Build inputs - ApplicationServices, expat, - Foundation, glib, libxml2, python3, @@ -87,41 +85,36 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc ]; - buildInputs = - [ - glib - libxml2 - expat - (python3.withPackages (p: [ p.pycairo ])) + buildInputs = [ + glib + libxml2 + expat + (python3.withPackages (p: [ p.pycairo ])) - # Optional dependencies - cfitsio - cgif - fftw - imagemagick - lcms2 - libarchive - libexif - libheif - libhwy - libimagequant - libjpeg - libjxl - librsvg - libspng - libtiff - libwebp - matio - openexr - openjpeg - openslide - pango - poppler - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + # Optional dependencies + cfitsio + cgif + fftw + imagemagick + lcms2 + libarchive + libexif + libheif + libhwy + libimagequant + libjpeg + libjxl + librsvg + libspng + libtiff + libwebp + matio + openexr + openjpeg + openslide + pango + poppler + ]; # Required by .pc file propagatedBuildInputs = [ diff --git a/pkgs/by-name/vi/virtualpg/package.nix b/pkgs/by-name/vi/virtualpg/package.nix index a32c0d46f1c6..094d74e3f5d2 100644 --- a/pkgs/by-name/vi/virtualpg/package.nix +++ b/pkgs/by-name/vi/virtualpg/package.nix @@ -5,7 +5,6 @@ validatePkgConfig, libpq, sqlite, - darwin, }: stdenv.mkDerivation rec { @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpq sqlite - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; + ]; meta = with lib; { description = "Loadable dynamic extension to both SQLite and SpatiaLite"; diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix index 35ffac76f144..d245e1162b45 100644 --- a/pkgs/by-name/vi/visp/package.nix +++ b/pkgs/by-name/vi/visp/package.nix @@ -1,7 +1,6 @@ { cmake, coin3d, - darwin, doxygen, eigen, fetchFromGitHub, @@ -88,8 +87,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ coin3d v4l-utils - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.IOKit ]; + ]; doCheck = true; diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix index 2b3cdbaf80a0..8f5ca40616ce 100644 --- a/pkgs/by-name/vl/vlang/package.nix +++ b/pkgs/by-name/vl/vlang/package.nix @@ -10,7 +10,6 @@ boehmgc, xorg, binaryen, - darwin, }: let @@ -76,9 +75,6 @@ stdenv.mkDerivation { [ binaryen ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 xorg.libXau diff --git a/pkgs/by-name/vr/vrpn/package.nix b/pkgs/by-name/vr/vrpn/package.nix index 6351f7d1ae6e..18b4013ce58d 100644 --- a/pkgs/by-name/vr/vrpn/package.nix +++ b/pkgs/by-name/vr/vrpn/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, unzip, cmake, - darwin, libGLU, libGL, }: @@ -25,17 +24,10 @@ stdenv.mkDerivation rec { unzip ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.GLUT - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.OpenGL - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libGLU - libGL - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libGLU + libGL + ]; meta = with lib; { description = "Virtual Reality Peripheral Network"; diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index 63e42bb73b67..1dd8afc27caa 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -6,8 +6,6 @@ buildPackages, libsecret, xcbuild, - Security, - AppKit, pkg-config, node-gyp, runCommand, @@ -33,12 +31,7 @@ buildNpmPackage rec { node-gyp ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - AppKit - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]; postPatch = '' ${lib.getExe buildPackages.jq} ' diff --git a/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix b/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix index 390eb579b0bf..db046be77a24 100644 --- a/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix +++ b/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix @@ -10,7 +10,6 @@ help2man, gengetopt, vsmartcard-vpcd, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -27,24 +26,20 @@ stdenv.mkDerivation (finalAttrs: { help2man ]; - buildInputs = - [ - pcsclite - libnfc - gengetopt - (python3.withPackages ( - pp: with pp; [ - pyscard - pycrypto - pbkdf2 - pillow - gnureadline - ] - )) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.PCSC - ]; + buildInputs = [ + pcsclite + libnfc + gengetopt + (python3.withPackages ( + pp: with pp; [ + pyscard + pycrypto + pbkdf2 + pillow + gnureadline + ] + )) + ]; meta = { description = "Relays a smart card using an contact-less interface"; diff --git a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix index 490115a6ce8b..a3f78c82d9ab 100644 --- a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix +++ b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix @@ -9,7 +9,6 @@ qrencode, python3, help2man, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -32,23 +31,19 @@ stdenv.mkDerivation (finalAttrs: { help2man ]; - buildInputs = - [ - pcsclite - qrencode - (python3.withPackages ( - pp: with pp; [ - pyscard - pycrypto - pbkdf2 - pillow - gnureadline - ] - )) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.PCSC - ]; + buildInputs = [ + pcsclite + qrencode + (python3.withPackages ( + pp: with pp; [ + pyscard + pycrypto + pbkdf2 + pillow + gnureadline + ] + )) + ]; configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--enable-infoplist"; diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix index 94d1fcb6d377..e2519a1e5845 100644 --- a/pkgs/by-name/vv/vvvvvv/package.nix +++ b/pkgs/by-name/vv/vvvvvv/package.nix @@ -11,8 +11,6 @@ physfs, SDL2, tinyxml-2, - Foundation, - IOKit, makeAndPlay ? false, }: @@ -41,17 +39,12 @@ stdenv.mkDerivation rec { copyDesktopItems ]; - buildInputs = - [ - faudio - physfs - SDL2 - tinyxml-2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - IOKit - ]; + buildInputs = [ + faudio + physfs + SDL2 + tinyxml-2 + ]; cmakeDir = "../desktop_version"; diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix index d70166275e6b..385e9af0a2b1 100644 --- a/pkgs/by-name/wa/wapm/package.nix +++ b/pkgs/by-name/wa/wapm/package.nix @@ -5,8 +5,6 @@ libiconv, openssl, rustPlatform, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,18 +23,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; - buildInputs = - [ - libiconv - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ + libiconv + openssl + ]; doCheck = false; diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix index b01b2396a4bd..f3e1ff341860 100644 --- a/pkgs/by-name/wa/wash-cli/package.nix +++ b/pkgs/by-name/wa/wash-cli/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchCrate, rustPlatform, pkg-config, openssl, - darwin, fetchurl, }: @@ -34,12 +32,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ openssl ]; preBuild = " export WASI_PREVIEW1_COMMAND_COMPONENT_ADAPTER=${wasiPreviewCommandComponentAdapter} diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix index 7810cc4a08d2..24a86a73edef 100644 --- a/pkgs/by-name/wa/wasm-pack/package.nix +++ b/pkgs/by-name/wa/wasm-pack/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, cmake, pkg-config, zstd, @@ -28,9 +26,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security ++ [ - zstd - ]; + buildInputs = [ zstd ]; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix index 0536ed30e8f2..273be1c20296 100644 --- a/pkgs/by-name/wa/wasmer-pack/package.nix +++ b/pkgs/by-name/wa/wasmer-pack/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-PZudXmdPz6fG7NDC/yN7qG+RQFSzNynXo6SpYJEku9A="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - cargoBuildFlags = [ "-p=wasmer-pack-cli" ]; # requires internet access diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 3b8e300d2696..a1e24f12502c 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -5,8 +5,6 @@ pkg-config, sqlite, zstd, - stdenv, - darwin, nixosTests, }: @@ -28,14 +26,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix index 5e9b3602181e..f00d2aef05f3 100644 --- a/pkgs/by-name/we/websocat/package.nix +++ b/pkgs/by-name/we/websocat/package.nix @@ -2,7 +2,6 @@ lib, stdenv, bash, - darwin, fetchFromGitHub, libiconv, makeWrapper, @@ -35,7 +34,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index 5aa132e5ceba..f0c1c3eef7eb 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -11,7 +11,6 @@ # libraries brotli, bzip2, - darwin, gpgme, libhsts, libidn2, @@ -76,9 +75,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals sslSupport [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices ]; # TODO: include translation files diff --git a/pkgs/by-name/wg/wgpu-utils/package.nix b/pkgs/by-name/wg/wgpu-utils/package.nix index 05adb6c51a5b..0a1141b6319c 100644 --- a/pkgs/by-name/wg/wgpu-utils/package.nix +++ b/pkgs/by-name/wg/wgpu-utils/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -9,7 +8,6 @@ vulkan-loader, freetype, fontconfig, - darwin, }: rustPlatform.buildRustPackage rec { @@ -32,19 +30,10 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = - [ - freetype - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - QuartzCore - AppKit - ] - ); + buildInputs = [ + freetype + fontconfig + ]; # Tests fail, as the Nix sandbox doesn't provide an appropriate adapter (e.g. Vulkan). doCheck = false; diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix index 917c1f2d4370..e91f348c20f9 100644 --- a/pkgs/by-name/wi/widelands/package.nix +++ b/pkgs/by-name/wi/widelands/package.nix @@ -25,7 +25,6 @@ libSM, libICE, libXext, - darwin, }: stdenv.mkDerivation rec { @@ -62,32 +61,24 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = - [ - SDL2 - SDL2_image - SDL2_mixer - SDL2_net - SDL2_ttf - curl - glew - icu - libpng - lua - python3 - zlib - minizip - asio - libSM # XXX: these should be propagated by SDL2? - libICE - ] - ++ lib.optional stdenv.hostPlatform.isLinux libXext - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - ] - ); + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + SDL2_net + SDL2_ttf + curl + glew + icu + libpng + lua + python3 + zlib + minizip + asio + libSM # XXX: these should be propagated by SDL2? + libICE + ] ++ lib.optional stdenv.hostPlatform.isLinux libXext; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/wi/wiper/package.nix b/pkgs/by-name/wi/wiper/package.nix index bbf4eb8f3541..40772f3986bd 100644 --- a/pkgs/by-name/wi/wiper/package.nix +++ b/pkgs/by-name/wi/wiper/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, }: @@ -22,8 +20,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-p2bUiRLI0vfOAAi4Cb8B9E8kMVS6aX4ksbF+H9gMsDs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - meta = { description = "Disk analyser and cleanup tool"; changelog = "https://github.com/ikebastuz/wiper/releases/tag/v${version}"; diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index 5933810851dd..a35b9147e956 100644 --- a/pkgs/by-name/wo/wownero/package.nix +++ b/pkgs/by-name/wo/wownero/package.nix @@ -12,7 +12,6 @@ readline, unbound, zeromq, - darwin, }: let @@ -60,19 +59,15 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = - [ - boost186 - libsodium - openssl - rapidjson - readline - unbound - zeromq - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; + buildInputs = [ + boost186 + libsodium + openssl + rapidjson + readline + unbound + zeromq + ]; postUnpack = '' rm -r $sourceRoot/external/miniupnp diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix index be0b4608788e..622e19bf5ce4 100644 --- a/pkgs/by-name/wt/wthrr/package.nix +++ b/pkgs/by-name/wt/wthrr/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,15 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; checkFlags = [ # requires internet access diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index b5bc96f793eb..6d334268964a 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, nix-update-script, }: @@ -18,14 +16,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+M0s6v9ULf+D2pPOE8KlHoyV+jBMbPsAXpYxGjms5DY="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Security - SystemConfiguration - ] - ); - useFetchCargoVendor = true; cargoHash = "sha256-sv9hSTmq5J6s0PPBMJgaMUWBaRk0/NJV41nNDIj6MoY="; diff --git a/pkgs/by-name/wx/wxformbuilder/package.nix b/pkgs/by-name/wx/wxformbuilder/package.nix index 3a90c0d8e22d..b04d229c6667 100644 --- a/pkgs/by-name/wx/wxformbuilder/package.nix +++ b/pkgs/by-name/wx/wxformbuilder/package.nix @@ -48,14 +48,10 @@ stdenv.mkDerivation (finalAttrs: { shared-mime-info ]; - buildInputs = - [ - boost - wxGTK32 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + boost + wxGTK32 + ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix index f1e182b28817..da3519ae0fd4 100644 --- a/pkgs/by-name/x3/x3270/package.nix +++ b/pkgs/by-name/x3/x3270/package.nix @@ -1,6 +1,5 @@ { stdenv, - darwin, lib, libiconv, fetchurl, @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; meta = with lib; { diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix index 26815dd7a0c7..c7a7e4108e5c 100644 --- a/pkgs/by-name/x4/x4/package.nix +++ b/pkgs/by-name/x4/x4/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix index 46b0b7552148..a2be67345401 100644 --- a/pkgs/by-name/xc/xcbuild/package.nix +++ b/pkgs/by-name/xc/xcbuild/package.nix @@ -10,11 +10,6 @@ stdenv, zlib, - # These arguments are obsolete but required to avoid evaluation errors (for now). - CoreGraphics ? null, - CoreServices ? null, - ImageIO ? null, - # These are deprecated and do nothing. They’re needed for compatibility and will # warn eventually once in-tree uses are cleaned up. xcodePlatform ? null, diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 7d9433cc4221..73e497710209 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -1,7 +1,6 @@ { lib, cmake, - darwin, fetchFromGitHub, libopus, openssl, @@ -35,9 +34,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/xm/xml-security-c/package.nix b/pkgs/by-name/xm/xml-security-c/package.nix index e198848d0fa2..6a446e80abb8 100644 --- a/pkgs/by-name/xm/xml-security-c/package.nix +++ b/pkgs/by-name/xm/xml-security-c/package.nix @@ -7,12 +7,8 @@ xalanc, xercesc, openssl, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration; -in stdenv.mkDerivation (finalAttrs: { pname = "xml-security-c"; version = "3.0.0"; @@ -34,17 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - xalanc - xercesc - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - CoreServices - SystemConfiguration - ]; + buildInputs = [ + xalanc + xercesc + openssl + ]; meta = { homepage = "https://shibboleth.atlassian.net/wiki/spaces/DEV/pages/3726671873/Santuario"; diff --git a/pkgs/by-name/xq/xqilla/package.nix b/pkgs/by-name/xq/xqilla/package.nix index 1287f301f26f..626cfe2d705c 100644 --- a/pkgs/by-name/xq/xqilla/package.nix +++ b/pkgs/by-name/xq/xqilla/package.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, fetchpatch, - darwin, xercesc, }: @@ -30,17 +29,9 @@ stdenv.mkDerivation rec { "CXXFLAGS=-std=c++14" ]; - buildInputs = - [ - xercesc - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + xercesc + ]; meta = with lib; { description = "XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index efd8965208dc..6b5a3a724f28 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -4,8 +4,6 @@ lib, installShellFiles, - stdenv, - Foundation, rust-jemalloc-sys, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { env.VERGEN_BUILD_DATE = "2025-04-08"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + buildInputs = [ rust-jemalloc-sys ]; postInstall = '' installShellCompletion --cmd yazi \ diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index f6e958b02d20..b506813ccf40 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -17,7 +17,6 @@ boost, llvmPackages, fixDarwinDylibNames, - Cocoa, }: stdenv.mkDerivation { @@ -51,8 +50,7 @@ stdenv.mkDerivation { jedi jedi-language-server pybind11 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ]; buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index 53ca6814919d..e0ca6316a014 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, sqlite, - stdenv, - darwin, mpv, yt-dlp, makeBinaryWrapper, @@ -36,16 +34,11 @@ rustPlatform.buildRustPackage rec { makeBinaryWrapper ]; - buildInputs = - [ - openssl - sqlite - mpv - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + sqlite + mpv + ]; postInstall = '' wrapProgram $out/bin/ytui_music \ diff --git a/pkgs/by-name/yu/yubico-piv-tool/package.nix b/pkgs/by-name/yu/yubico-piv-tool/package.nix index ed8ef956b590..984b869c7503 100644 --- a/pkgs/by-name/yu/yubico-piv-tool/package.nix +++ b/pkgs/by-name/yu/yubico-piv-tool/package.nix @@ -2,7 +2,6 @@ lib, check, cmake, - darwin, fetchFromGitHub, gengetopt, help2man, @@ -47,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl zlib - ] ++ (if withApplePCSC then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]); + ] ++ lib.optionals (!withApplePCSC) [ pcsclite ]; cmakeFlags = [ (lib.cmakeBool "GENERATE_MAN_PAGES" true) diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix index 58358991c087..e3b31d5be648 100644 --- a/pkgs/by-name/yu/yubihsm-shell/package.nix +++ b/pkgs/by-name/yu/yubihsm-shell/package.nix @@ -11,7 +11,6 @@ pkg-config, pcsclite, help2man, - darwin, libiconv, }: @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { pcsclite.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.PCSC libiconv ]; diff --git a/pkgs/by-name/yu/yubikey-agent/package.nix b/pkgs/by-name/yu/yubikey-agent/package.nix index 98a97dab94bf..e8b8a39e27be 100644 --- a/pkgs/by-name/yu/yubikey-agent/package.nix +++ b/pkgs/by-name/yu/yubikey-agent/package.nix @@ -6,7 +6,6 @@ libnotify, pcsclite, pkg-config, - darwin, }: buildGoModule rec { @@ -20,9 +19,7 @@ buildGoModule rec { sha256 = "sha256-Knk1ipBOzjmjrS2OFUMuxi1TkyDcSYlVKezDWT//ERY="; }; - buildInputs = - lib.optional stdenv.hostPlatform.isLinux (lib.getDev pcsclite) - ++ lib.optional stdenv.hostPlatform.isDarwin (darwin.apple_sdk.frameworks.PCSC); + buildInputs = lib.optional stdenv.hostPlatform.isLinux (lib.getDev pcsclite); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix index d3d4b80297bb..cf39cf4c7cf0 100644 --- a/pkgs/by-name/ze/zerotierone/package.nix +++ b/pkgs/by-name/ze/zerotierone/package.nix @@ -12,7 +12,6 @@ rustc, zlib, libiconv, - darwin, fetchpatch, }: @@ -83,8 +82,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.SystemConfiguration - darwin.apple_sdk.frameworks.CoreServices ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix index 0f218e6ae8e7..d592b14611f7 100644 --- a/pkgs/by-name/zi/zine/package.nix +++ b/pkgs/by-name/zi/zine/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,13 +27,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Simple and opinionated tool to build your own magazine"; diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix index 155c6a492eec..9014dec615c5 100644 --- a/pkgs/by-name/zo/zola/package.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -5,7 +5,6 @@ rustPlatform, pkg-config, oniguruma, - darwin, installShellFiles, zola, testers, @@ -30,17 +29,9 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + oniguruma + ]; RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix index 9d233cee4bd4..e1d9900a8b7f 100644 --- a/pkgs/development/ada-modules/gnatcoll/bindings.nix +++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix @@ -14,7 +14,6 @@ zlib, python3, ncurses, - darwin, }: let @@ -52,10 +51,6 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; - # propagate since gprbuild needs to find referenced .gpr files # and all dependency C libraries when statically linking a # downstream executable. diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 9f2570038e1f..ac7355ea4ef8 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -37,7 +37,6 @@ in pkgs.libglvnd pkgs.libGLU ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkgs.xorg.libX11 ] )) old @@ -137,13 +136,10 @@ in mosquitto = addToPropagatedBuildInputs ([ pkgs.mosquitto ]); nanomsg = addToBuildInputs pkgs.nanomsg; ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; - opencl = addToBuildInputs ( - [ - pkgs.opencl-headers - pkgs.ocl-icd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ] - ); + opencl = addToBuildInputs ([ + pkgs.opencl-headers + pkgs.ocl-icd + ]); openssl = addToBuildInputs pkgs.openssl; plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.libpq; @@ -223,16 +219,10 @@ in }; opengl = old: - (addToBuildInputsWithPkgConfig ( - lib.optionals (!stdenv.hostPlatform.isDarwin) [ - pkgs.libGL - pkgs.libGLU - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Foundation - pkgs.darwin.apple_sdk.frameworks.OpenGL - ] - ) old) + (addToBuildInputsWithPkgConfig (lib.optionals (!stdenv.hostPlatform.isDarwin) [ + pkgs.libGL + pkgs.libGLU + ]) old) // { postPatch = '' substituteInPlace opengl.egg \ diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index f7f42bfad9ad..73ed0eae1b41 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -44,7 +44,7 @@ let buildPlatform targetPlatform ; - inherit (swiftPackages) apple_sdk swift; + inherit (swiftPackages) swift; releaseManifest = lib.importJSON releaseManifestFile; inherit (releaseManifest) release sourceRepository tag; @@ -111,24 +111,12 @@ stdenv.mkDerivation rec { krb5 lttng-ust_2_12 ] - ++ lib.optionals isDarwin ( - with apple_sdk.frameworks; - [ - xcbuild - swift - (krb5.overrideAttrs (old: { - # the propagated build inputs break swift compilation - buildInputs = old.buildInputs ++ old.propagatedBuildInputs; - propagatedBuildInputs = [ ]; - })) - sigtool - Foundation - CoreFoundation - CryptoKit - System - ] - ++ lib.optional (lib.versionAtLeast version "9") GSS - ); + ++ lib.optionals isDarwin [ + xcbuild + swift + krb5 + sigtool + ]; # This is required to fix the error: # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 655bd017a782..48562a4c5955 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -12,7 +12,6 @@ callPackage, zlib, swiftPackages, - darwin, icu, lndir, replaceVars, @@ -222,17 +221,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { [ zlib ] - ++ lib.optional stdenv.hostPlatform.isDarwin ( - with darwin; - with apple_sdk.frameworks; - [ - swiftPackages.swift - Foundation - CryptoKit - GSS - ICU - ] - ); + ++ lib.optional stdenv.hostPlatform.isDarwin [ + swiftPackages.swift + ]; build = '' dotnet restore -p:PublishAot=true dotnet publish -p:PublishAot=true -o $out/bin diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix index b3c529c7d5c7..dc80996ad3ca 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -4,9 +4,7 @@ rustPlatform, fetchurl, openssl, - stdenv, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; useFetchCargoVendor = true; cargoHash = "sha256-iDyGPE1BEh1uIf4K6ijtlqugWFtfM/2GGda0u/lCLJ0="; diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix index 09cd91fde758..7551d4762cf4 100644 --- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, openssl, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,15 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-l3RV+j3wAQ88QGNXLILp7YiUpdk7bkN25Y723pDZw48="; }; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreServices - ] - ); + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; useFetchCargoVendor = true; cargoHash = "sha256-F3/v4zYGZRv1PRVl/Tas+e0pc/dTM6ina+/c63KVuZY="; diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix index 5356ac149022..ee62f1da0e1f 100644 --- a/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -14,7 +14,6 @@ libmpc, libucontext ? null, libxcrypt ? null, - darwin ? null, isSnapshot ? false, isl ? null, zlib ? null, @@ -81,10 +80,7 @@ in ] ++ optionals (isl != null) [ isl ] ++ optionals (zlib != null) [ zlib ] - ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ] - ++ optionals (lib.versionAtLeast version "14" && stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.CoreServices - ]; + ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ]; depsTargetTarget = optionals ( !withoutTargetLibc && threadsCross != { } && threadsCross.package != null diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 8c5ba7d4c046..7ea055619e1c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -2,7 +2,6 @@ lib, stdenv, autoPatchelfHook, - darwin, graalvm-ce, makeWrapper, zlib, @@ -39,14 +38,11 @@ stdenv.mkDerivation ( ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook ++ extraNativeBuildInputs; - buildInputs = - [ - (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - zlib - libxcrypt-legacy # libcrypt.so.1 (default is .2 now) - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation - ++ extraBuildInputs; + buildInputs = [ + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 + zlib + libxcrypt-legacy # libcrypt.so.1 (default is .2 now) + ] ++ extraBuildInputs; unpackPhase = '' runHook preUnpack diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 4756acfb425f..0207f345bf26 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -9,7 +9,6 @@ pcre2, neko, mbedtls_2, - Security, }: let ocamlDependencies = @@ -66,7 +65,6 @@ let ] ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ]) ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 - ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.hostPlatform.isDarwin) Security ++ ocamlDependencies version; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 54d7f8c68977..0d1840400d7f 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { --replace-fail "e.message().unwrap()" "e.payload()" ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security - ]; - # requires nightly features RUSTC_BOOTSTRAP = true; diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index cebb3614490d..b83bb18c23bb 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitLab, git, @@ -11,7 +10,6 @@ mustache-go, yaml2json, tezos-rust-libs, - darwin, }: ocamlPackages.buildDunePackage rec { @@ -46,80 +44,75 @@ ocamlPackages.buildDunePackage rec { yaml2json ]; - buildInputs = - with ocamlPackages; - [ - coq - menhir - menhirLib - qcheck - ocamlgraph - bisect_ppx - decompress - fileutils - ppx_deriving - ppx_deriving_yojson - ppx_yojson_conv - ppx_expect - ppx_import - terminal_size - ocaml-recovery-parser - yojson - getopt - core - core_unix - pprint - linenoise - crunch - semver - lambda-term - tar-unix - parse-argv - hacl-star - prometheus - lwt_ppx - msgpck - # lsp - linol - linol-lwt - ocaml-lsp - # Test helpers deps - qcheck - qcheck-alcotest - alcotest-lwt - # vendored tezos' deps - aches - aches-lwt - ctypes - ctypes_stubs_js - class_group_vdf - dune-configurator - hacl-star - hacl-star-raw - lwt-canceler - ipaddr - bls12-381 - bls12-381-signature - ptime - mtime - lwt_log - secp256k1-internal - resto - resto-directory - resto-cohttp-self-serving-client - irmin-pack - ezjsonm - data-encoding - pure-splitmix - zarith_stubs_js - simple-diff - seqes - stdint - tezt - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = with ocamlPackages; [ + coq + menhir + menhirLib + qcheck + ocamlgraph + bisect_ppx + decompress + fileutils + ppx_deriving + ppx_deriving_yojson + ppx_yojson_conv + ppx_expect + ppx_import + terminal_size + ocaml-recovery-parser + yojson + getopt + core + core_unix + pprint + linenoise + crunch + semver + lambda-term + tar-unix + parse-argv + hacl-star + prometheus + lwt_ppx + msgpck + # lsp + linol + linol-lwt + ocaml-lsp + # Test helpers deps + qcheck + qcheck-alcotest + alcotest-lwt + # vendored tezos' deps + aches + aches-lwt + ctypes + ctypes_stubs_js + class_group_vdf + dune-configurator + hacl-star + hacl-star-raw + lwt-canceler + ipaddr + bls12-381 + bls12-381-signature + ptime + mtime + lwt_log + secp256k1-internal + resto + resto-directory + resto-cohttp-self-serving-client + irmin-pack + ezjsonm + data-encoding + pure-splitmix + zarith_stubs_js + simple-diff + seqes + stdint + tezt + ]; nativeCheckInputs = [ cacert diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index c8f6fdddf163..f2d705c84779 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -9,13 +9,6 @@ libGL, xorg, - # Darwin deps - CoreFoundation, - Cocoa, - AudioToolbox, - OpenGL, - Foundation, - ForceFeedback, }: stdenv.mkDerivation (finalAttrs: { @@ -30,22 +23,11 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - CoreFoundation - Cocoa - AudioToolbox - OpenGL - Foundation - ForceFeedback - ] - else - [ - libGL - xorg.libX11 - xorg.libXext - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGL + xorg.libX11 + xorg.libXext + ]; preConfigure = '' cd dev diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix index 66d8ff8a010a..b817c27c3817 100644 --- a/pkgs/development/compilers/mono/4.nix +++ b/pkgs/development/compilers/mono/4.nix @@ -1,13 +1,12 @@ { callPackage, - Foundation, libobjc, stdenv, lib, }: -callPackage ./generic.nix ({ - inherit Foundation libobjc; +callPackage ./generic.nix { + inherit libobjc; version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645 @@ -19,4 +18,4 @@ callPackage ./generic.nix ({ "-Wno-error=int-conversion" "-Wno-error=return-mismatch" ]; -}) +} diff --git a/pkgs/development/compilers/mono/5.nix b/pkgs/development/compilers/mono/5.nix index 4cf7252dcc35..850882d8cf24 100644 --- a/pkgs/development/compilers/mono/5.nix +++ b/pkgs/development/compilers/mono/5.nix @@ -1,13 +1,12 @@ { callPackage, - Foundation, libobjc, }: -callPackage ./generic.nix ({ - inherit Foundation libobjc; +callPackage ./generic.nix { + inherit libobjc; version = "5.20.1.34"; sha256 = "12vw5dkhmp1vk9l658pil8jiqirkpdsc5z8dm5mpj595yr6d94fd"; enableParallelBuilding = true; env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; -}) +} diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix index 9cabf7ba4441..414cdeb8badc 100644 --- a/pkgs/development/compilers/mono/6.nix +++ b/pkgs/development/compilers/mono/6.nix @@ -1,13 +1,12 @@ { callPackage, - Foundation, libobjc, }: -callPackage ./generic.nix ({ - inherit Foundation libobjc; +callPackage ./generic.nix { + inherit libobjc; version = "6.12.0.182"; srcArchiveSuffix = "tar.xz"; sha256 = "sha256-VzZqarTztezxEdSFSAMWFbOhANuHxnn8AG6Mik79lCQ="; enableParallelBuilding = true; -}) +} diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 56547ece52e6..42998c3f53bd 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -13,7 +13,6 @@ zlib, bash, cacert, - Foundation, libobjc, python3, version, @@ -63,7 +62,6 @@ stdenv.mkDerivation rec { bash ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation libobjc ]; diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 7d7f4423ccd8..e390b43341fc 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -5,7 +5,6 @@ wrapRustc, bash, curl, - darwin, zlib, autoPatchelfHook, gcc, @@ -17,7 +16,6 @@ let inherit (lib) optionalString; - inherit (darwin.apple_sdk.frameworks) Security; bootstrapping = versionType == "bootstrap"; @@ -46,8 +44,7 @@ rec { buildInputs = [ bash ] ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib - ++ lib.optional (!stdenv.hostPlatform.isDarwin) zlib - ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) zlib; postPatch = '' patchShebangs . @@ -152,10 +149,9 @@ rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; - buildInputs = - [ bash ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib - ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ + bash + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index d7a0e3d97873..590b29f55d8b 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -15,7 +15,6 @@ fetchurl, file, python3, - darwin, cargo, cmake, rustc, @@ -51,7 +50,6 @@ let optionalString concatStringsSep ; - inherit (darwin.apple_sdk.frameworks) Security; useLLVM = stdenv.targetPlatform.useLLVM or false; in stdenv.mkDerivation (finalAttrs: { @@ -349,7 +347,6 @@ stdenv.mkDerivation (finalAttrs: { [ openssl ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv - Security zlib ] ++ optional (!withBundledLLVM) llvmShared.lib diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 62d0a2b188e3..36ef2245c5ba 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -13,7 +13,6 @@ readline, libedit, libarchive, - Security, # optional dependencies withDb ? true, @@ -113,7 +112,6 @@ let freetype fontconfig ]) - ++ (lib.optional stdenv.hostPlatform.isDarwin Security) ++ extraLibraries'; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index d00ff1f4e92e..0215cd6f0ba3 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -16,14 +16,6 @@ let callPackage = newScope self; - # Current versions of Swift on Darwin require macOS SDK 10.15 at least. - # The Swift compiler propagates the 13.3 SDK and a 10.15 deployment target. - # Packages that need a newer version can add it to their build inputs - # to use it (as normal). - - # This SDK is included for compatibility with existing packages. - apple_sdk = pkgs.darwin.apple_sdk_11_0; - # Swift builds its own Clang for internal use. We wrap that clang with a # cc-wrapper derived from the clang configured below. Because cc-wrapper # applies a specific resource-root, the two versions are best matched, or @@ -88,13 +80,9 @@ let swift = swift-unwrapped; }; - sourcekit-lsp = callPackage ./sourcekit-lsp { - inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; - }; + sourcekit-lsp = callPackage ./sourcekit-lsp { }; - swift-docc = callPackage ./swift-docc { - inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; - }; + swift-docc = callPackage ./swift-docc { }; swift-format = callPackage ./swift-format { }; diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index 8d425bcc6f5c..ebfc8d008f91 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -11,8 +11,6 @@ XCTest, sqlite, ncurses, - CryptoKit, - LocalAuthentication, }: let sources = callPackage ../sources.nix { }; @@ -35,17 +33,12 @@ stdenv.mkDerivation { swift swiftpm ]; - buildInputs = - [ - Foundation - XCTest - sqlite - ncursesInput - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CryptoKit - LocalAuthentication - ]; + buildInputs = [ + Foundation + XCTest + sqlite + ncursesInput + ]; configurePhase = generated.configure diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index f1c1ee2dcd68..1ec9bae5603b 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -7,8 +7,6 @@ swiftpm2nix, Foundation, XCTest, - CryptoKit, - LocalAuthentication, }: let sources = callPackage ../sources.nix { }; @@ -27,15 +25,10 @@ stdenv.mkDerivation { swift swiftpm ]; - buildInputs = - [ - Foundation - XCTest - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CryptoKit - LocalAuthentication - ]; + buildInputs = [ + Foundation + XCTest + ]; configurePhase = generated.configure; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 0a455d45ce0f..d2913bf303ad 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -12,8 +12,6 @@ libffi, libobjc, libpfm, - Cocoa, - Foundation, }: let @@ -68,8 +66,6 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - Cocoa - Foundation ]; cmakeFlags = diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index d7b1b6018efc..e59750000393 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -7,7 +7,6 @@ libserialport, pkg-config, testers, - IOKit, }: stdenv.mkDerivation (finalAttrs: { @@ -29,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ argtable libserialport - ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; + ]; cmakeFlags = [ "-DBLISP_BUILD_CLI=ON" diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index 7babd86443a3..7b594468a732 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, libusb1, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; + buildInputs = [ libusb1 ]; postInstall = '' mkdir -p $out/etc/udev/rules.d diff --git a/pkgs/development/embedded/fpga/fujprog/default.nix b/pkgs/development/embedded/fpga/fujprog/default.nix index fea0900ab2af..224b671f9ff6 100644 --- a/pkgs/development/embedded/fpga/fujprog/default.nix +++ b/pkgs/development/embedded/fpga/fujprog/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, pkg-config, - IOKit, libftdi1, libusb-compat-0_1, }: @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 libusb-compat-0_1 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + ]; meta = with lib; { description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards"; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index ad2083f2e7bb..29672a195909 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -24,31 +24,14 @@ self: super: __darwinAllowLocalNetworking = true; }); - halive = addBuildDepend darwin.apple_sdk.frameworks.AppKit super.halive; - # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux hakyll = overrideCabal { testToolDepends = [ ]; doCheck = false; } super.hakyll; - barbly = addBuildDepend darwin.apple_sdk.frameworks.AppKit super.barbly; - double-conversion = addExtraLibrary pkgs.libcxx super.double-conversion; - streamly = addBuildDepend darwin.apple_sdk.frameworks.Cocoa super.streamly; - - apecs-physics = addPkgconfigDepends [ - darwin.apple_sdk.frameworks.ApplicationServices - ] super.apecs-physics; - - # Framework deps are hidden behind a flag - hmidi = addExtraLibraries [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreAudio - darwin.apple_sdk.frameworks.CoreMIDI - ] super.hmidi; - # "erf table" test fails on Darwin # https://github.com/bos/math-functions/issues/63 math-functions = dontCheck super.math-functions; @@ -73,16 +56,6 @@ self: super: gtk3 = appendConfigureFlag "-f have-quartz-gtk" super.gtk3; gtk = appendConfigureFlag "-f have-quartz-gtk" super.gtk; - OpenAL = addExtraLibrary darwin.apple_sdk.frameworks.OpenAL super.OpenAL; - - al = overrideCabal (drv: { - libraryFrameworkDepends = [ - darwin.apple_sdk.frameworks.OpenAL - ] ++ (drv.libraryFrameworkDepends or [ ]); - }) super.al; - - proteaaudio = addExtraLibrary darwin.apple_sdk.frameworks.AudioToolbox super.proteaaudio; - # issues finding libcharset.h without libiconv in buildInputs on darwin. with-utf8 = addExtraLibrary pkgs.libiconv super.with-utf8; with-utf8_1_1_0_0 = addExtraLibrary pkgs.libiconv super.with-utf8_1_1_0_0; @@ -157,34 +130,18 @@ self: super: sym = markBroken super.sym; - yesod-bin = addBuildDepend darwin.apple_sdk.frameworks.Cocoa super.yesod-bin; - yesod-core = super.yesod-core.overrideAttrs (drv: { # Allow access to local networking when the Darwin sandbox is enabled, so yesod-core can # run tests that access localhost. __darwinAllowLocalNetworking = true; }); - hidapi = addExtraLibraries [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.CoreFoundation - ] (super.hidapi.override { systemd = null; }); - - hmatrix = addBuildDepend darwin.apple_sdk.frameworks.Accelerate super.hmatrix; - - blas-hs = overrideCabal (drv: { - libraryFrameworkDepends = [ - darwin.apple_sdk.frameworks.Accelerate - ] ++ (drv.libraryFrameworkDepends or [ ]); - }) super.blas-hs; + hidapi = super.hidapi.override { systemd = null; }; # Ensure the necessary frameworks are propagatedBuildInputs on darwin OpenGLRaw = overrideCabal (drv: { librarySystemDepends = [ ]; - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ - darwin.apple_sdk.frameworks.OpenGL - ]; + libraryHaskellDepends = drv.libraryHaskellDepends; preConfigure = '' frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) @@ -193,30 +150,12 @@ self: super: '' + (drv.preConfigure or ""); }) super.OpenGLRaw; - GLURaw = overrideCabal (drv: { - librarySystemDepends = [ ]; - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ - darwin.apple_sdk.frameworks.OpenGL - ]; - }) super.GLURaw; bindings-GLFW = overrideCabal (drv: { librarySystemDepends = [ ]; libraryHaskellDepends = drv.libraryHaskellDepends ++ [ - darwin.apple_sdk.frameworks.AGL - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Kernel - darwin.apple_sdk.frameworks.CoreVideo darwin.CF ]; }) super.bindings-GLFW; - OpenCL = overrideCabal (drv: { - librarySystemDepends = [ ]; - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ - darwin.apple_sdk.frameworks.OpenCL - ]; - }) super.OpenCL; # cabal2nix likes to generate dependencies on hinotify when hfsevents is # really required on darwin: https://github.com/NixOS/cabal2nix/issues/146. @@ -224,23 +163,14 @@ self: super: # FSEvents API is very buggy and tests are unreliable. See # http://openradar.appspot.com/10207999 and similar issues. - fsnotify = addBuildDepend darwin.apple_sdk.frameworks.Cocoa (dontCheck super.fsnotify); + fsnotify = dontCheck super.fsnotify; FractalArt = overrideCabal (drv: { librarySystemDepends = [ darwin.libobjc - darwin.apple_sdk.frameworks.AppKit ] ++ (drv.librarySystemDepends or [ ]); }) super.FractalArt; - arbtt = overrideCabal (drv: { - librarySystemDepends = [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.IOKit - ] ++ (drv.librarySystemDepends or [ ]); - }) super.arbtt; - HTF = overrideCabal (drv: { # GNU find is not prefixed in stdenv postPatch = @@ -406,10 +336,6 @@ self: super: }) super.jsaddle-hello; jsaddle-wkwebview = overrideCabal (drv: { - libraryFrameworkDepends = with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ - Cocoa - WebKit - ]; libraryHaskellDepends = with self; [ aeson data-default diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bf0d7b5584af..2941bfaf44ce 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -323789,41 +323789,31 @@ self: { } ) { }; - "hfsevents" = - callPackage - ( - { - mkDerivation, - base, - bytestring, - cereal, - Cocoa, - CoreServices, - mtl, - text, - }: - mkDerivation { - pname = "hfsevents"; - version = "0.1.7"; - sha256 = "15xzg1wf3cf2jpz3wqifkhc9mh0hv4iby8qi4qpi3mbb0zz482p9"; - libraryHaskellDepends = [ - base - bytestring - cereal - mtl - text - ]; - librarySystemDepends = [ Cocoa ]; - libraryToolDepends = [ CoreServices ]; - description = "File/folder watching for OS X"; - license = lib.licenses.bsd3; - platforms = lib.platforms.darwin; - } - ) - { - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; - }; + "hfsevents" = callPackage ( + { + mkDerivation, + base, + bytestring, + cereal, + mtl, + text, + }: + mkDerivation { + pname = "hfsevents"; + version = "0.1.7"; + sha256 = "15xzg1wf3cf2jpz3wqifkhc9mh0hv4iby8qi4qpi3mbb0zz482p9"; + libraryHaskellDepends = [ + base + bytestring + cereal + mtl + text + ]; + description = "File/folder watching for OS X"; + license = lib.licenses.bsd3; + platforms = lib.platforms.darwin; + } + ) { }; "hfusion" = callPackage ( { diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 79c291f08e02..c5c35893e00d 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -9,8 +9,6 @@ gcc, cmake, libiconv, - CoreServices, - Security, }: rustPlatform.buildRustPackage rec { @@ -36,8 +34,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreServices - Security ]; checkFlags = [ diff --git a/pkgs/development/interpreters/gauche/boot.nix b/pkgs/development/interpreters/gauche/boot.nix index 4b3179da90c1..497ebba15557 100644 --- a/pkgs/development/interpreters/gauche/boot.nix +++ b/pkgs/development/interpreters/gauche/boot.nix @@ -10,7 +10,6 @@ zlib, mbedtls, cacert, - darwin, }: stdenv.mkDerivation rec { @@ -29,18 +28,14 @@ stdenv.mkDerivation rec { texinfo ]; - buildInputs = - [ - libiconv - gdbm - openssl - zlib - mbedtls - cacert - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk_11_0.frameworks.CoreServices - ]; + buildInputs = [ + libiconv + gdbm + openssl + zlib + mbedtls + cacert + ]; postPatch = '' patchShebangs . diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 3fb736ff7e38..7a72e64dec9f 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -12,7 +12,6 @@ zlib, mbedtls, cacert, - CoreServices, }: stdenv.mkDerivation rec { @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { zlib mbedtls cacert - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + ]; autoreconfPhase = '' ./DIST gen diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix index f7570e745d3d..891853bd83d3 100644 --- a/pkgs/development/interpreters/gnudatalanguage/default.nix +++ b/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -60,7 +60,6 @@ # and Darwin. enableWX ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), wxGTK32, - Cocoa, # X11: OFF by default for platform consistency. Use X where WX is not available enableXWin ? (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin), }: @@ -152,7 +151,6 @@ stdenv.mkDerivation rec { ++ lib.optional enableGRIB eccodes ++ lib.optional enableGLPK glpk ++ lib.optional enableWX wxGTK32 - ++ lib.optional (enableWX && stdenv.hostPlatform.isDarwin) Cocoa ++ lib.optional enableMPI mpi ++ lib.optional enableLibtirpc hdf4-custom.libtirpc ++ lib.optional enableSzip szip; diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix index 6fa17490d539..3193efaad5bc 100644 --- a/pkgs/development/interpreters/kerf/default.nix +++ b/pkgs/development/interpreters/kerf/default.nix @@ -7,10 +7,6 @@ ncurses, expect, - # darwin only below - Accelerate, - CoreGraphics, - CoreVideo, }: stdenv.mkDerivation rec { @@ -25,23 +21,11 @@ stdenv.mkDerivation rec { }; sourceRoot = "${src.name}/src"; - buildInputs = - [ - libedit - zlib - ncurses - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - [ - Accelerate - ] - ++ - lib.optionals stdenv.hostPlatform.isx86_64 # && isDarwin - [ - CoreGraphics - CoreVideo - ] - ); + buildInputs = [ + libedit + zlib + ncurses + ]; nativeCheckInputs = [ expect ]; doCheck = true; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 68c5ec0d1712..056a5416a62f 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -56,7 +56,6 @@ enableQt ? false, libsForQt5, libiconv, - darwin, }: let @@ -155,8 +154,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Accelerate - darwin.apple_sdk.frameworks.Cocoa ]; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index e3a354623953..bf36d886aa10 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -27,7 +27,6 @@ # platform-specific dependencies bashNonInteractive, - darwin, windows, # optional dependencies @@ -231,9 +230,6 @@ let ++ optionals bluezSupport [ bluez ] - ++ optionals enableFramework [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn windows.mingw_w64_pthreads diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index af2a4a5b749d..1589a122f516 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -2,7 +2,6 @@ __splicedPackages, callPackage, config, - darwin, db, lib, libffiBoot, diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 73ee14bd505c..b08a5e054915 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,8 +3,6 @@ stdenv, fetchFromGitHub, perl, - CoreServices, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -33,12 +31,7 @@ stdenv.mkDerivation rec { --replace '`sw_vers -productVersion`' '"11.0"' ''; - buildInputs = - [ perl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - ApplicationServices - ]; + buildInputs = [ perl ]; doCheck = false; # MoarVM does not come with its own test suite configureScript = "${perl}/bin/perl ./Configure.pl"; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4c42d151a1a2..e14e6e42f705 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -19,7 +19,6 @@ libiconv, libobjc, libunwind, - Foundation, buildEnv, bundler, bundix, @@ -123,7 +122,6 @@ let libiconv, libobjc, libunwind, - Foundation, makeBinaryWrapper, buildRubyGem, defaultGemConfig, @@ -187,7 +185,6 @@ let libiconv libobjc libunwind - Foundation ]; propagatedBuildInputs = op jemallocSupport jemalloc; diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index 2a0601a8875e..820ae89b83ca 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -6,7 +6,6 @@ autoreconfHook, pkg-config, pcsclite, - PCSC, }: stdenv.mkDerivation rec { @@ -28,9 +27,7 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ PCSC ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-deprecated-non-prototype"; diff --git a/pkgs/development/libraries/audio/cubeb/default.nix b/pkgs/development/libraries/audio/cubeb/default.nix index 9c7e3a5c79b6..f736e87e8290 100644 --- a/pkgs/development/libraries/audio/cubeb/default.nix +++ b/pkgs/development/libraries/audio/cubeb/default.nix @@ -9,9 +9,6 @@ libpulseaudio, sndio, speexdsp, - AudioUnit, - CoreAudio, - CoreServices, lazyLoad ? !stdenv.hostPlatform.isDarwin, }: @@ -44,18 +41,7 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = - [ speexdsp ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ - AudioUnit - CoreAudio - CoreServices - ] - else - backendLibs - ); + buildInputs = [ speexdsp ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) backendLibs; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index e289cc2c3f9f..00f98be49fe9 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -12,7 +12,6 @@ jackSupport ? true, jack, coreaudioSupport ? stdenv.hostPlatform.isDarwin, - CoreAudio, }: stdenv.mkDerivation rec { @@ -35,8 +34,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional jackSupport jack - ++ lib.optional coreaudioSupport CoreAudio; + ++ lib.optional jackSupport jack; cmakeFlags = [ "-DRTAUDIO_API_ALSA=${if alsaSupport then "ON" else "OFF"}" diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index b22849d2d54f..fb8d867d96f8 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -10,9 +10,6 @@ jackSupport ? true, jack, coremidiSupport ? stdenv.hostPlatform.isDarwin, - CoreMIDI, - CoreAudio, - CoreServices, }: stdenv.mkDerivation rec { @@ -31,14 +28,7 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - lib.optional alsaSupport alsa-lib - ++ lib.optional jackSupport jack - ++ lib.optionals coremidiSupport [ - CoreMIDI - CoreAudio - CoreServices - ]; + buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport jack; cmakeFlags = [ "-DRTMIDI_API_ALSA=${if alsaSupport then "ON" else "OFF"}" diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 6fc237975332..de5ce22b017a 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -4,8 +4,6 @@ fetchurl, fetchpatch, alsa-lib, - AudioUnit, - CoreServices, }: let @@ -27,14 +25,9 @@ stdenv.mkDerivation rec { pname = "audiofile"; version = "0.3.6"; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - AudioUnit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; src = fetchurl { url = "https://audiofile.68k.org/audiofile-${version}.tar.gz"; diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 8f485a04fb2b..eceed9985693 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -6,7 +6,6 @@ aws-c-common, nix, openssl, - Security, }: stdenv.mkDerivation (finalAttrs: { @@ -33,8 +32,6 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index ef2a51754de2..ddf698b7bb54 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -7,7 +7,6 @@ aws-c-common, nix, s2n-tls, - Security, }: stdenv.mkDerivation rec { @@ -29,7 +28,6 @@ stdenv.mkDerivation rec { aws-c-common s2n-tls ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 47ef7a371a72..a0854db31509 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -7,8 +7,6 @@ openssl, zlib, aws-crt-cpp, - CoreAudio, - AudioToolbox, nix, arrow-cpp, aws-sdk-cpp, @@ -85,20 +83,11 @@ stdenv.mkDerivation rec { curl ]; - buildInputs = - [ - curl - openssl - zlib - ] - ++ lib.optionals - ( - stdenv.hostPlatform.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis)) - ) - [ - CoreAudio - AudioToolbox - ]; + buildInputs = [ + curl + openssl + zlib + ]; # propagation is needed for Security.framework to be available when linking propagatedBuildInputs = [ aws-crt-cpp ]; diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 0e482049b11a..a5b22730df73 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -7,7 +7,6 @@ bzip2, zlib, jitterentropy, - darwin, static ? stdenv.hostPlatform.isStatic, # generates static libraries *only* }: @@ -51,13 +50,7 @@ let bzip2 zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - Security - ] - ) + ++ lib.optionals (lib.versionAtLeast version "3.6.0") [ jitterentropy ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 197d9313de27..6b1bb1c8307d 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -13,10 +13,6 @@ xorgproto, libXi, pkg-config, - Carbon, - Cocoa, - Kernel, - OpenGL, settingsFile ? "include/box2d/b2_settings.h", }: @@ -40,24 +36,17 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - libGLU - libGL - libglut - libX11 - libXcursor - libXinerama - libXrandr - xorgproto - libXi - ] - ++ optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - Kernel - OpenGL - ]; + buildInputs = [ + libGLU + libGL + libglut + libX11 + libXcursor + libXinerama + libXrandr + xorgproto + libXi + ]; cmakeFlags = [ (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix index 9ffbc38316a3..6b9e196fae06 100644 --- a/pkgs/development/libraries/cairomm/1.16.nix +++ b/pkgs/development/libraries/cairomm/1.16.nix @@ -9,7 +9,6 @@ cairo, fontconfig, libsigcxx30, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -32,14 +31,10 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - boost # for tests - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - ]; + buildInputs = [ + boost # for tests + fontconfig + ]; propagatedBuildInputs = [ cairo diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 6c7046a15e53..f570ca3c4528 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -3,7 +3,6 @@ stdenv, lib, pkg-config, - darwin, boost, cairo, fontconfig, @@ -32,17 +31,10 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - boost # for tests - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - ApplicationServices - ] - ); + buildInputs = [ + boost # for tests + fontconfig + ]; propagatedBuildInputs = [ cairo diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 2786ea7b1dca..a28c22d0443f 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - Foundation, }: stdenv.mkDerivation rec { @@ -18,8 +17,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Foundation; - installTargets = [ "install_hdrs" ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib" diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index e8ea400c958b..853bc99382bb 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -2,7 +2,6 @@ fetchurl, lib, stdenv, - CoreServices, }: stdenv.mkDerivation rec { @@ -22,8 +21,6 @@ stdenv.mkDerivation rec { # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; - meta = with lib; { description = "Unit testing framework for C"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 58164f4454a5..76bf395f125d 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -21,7 +21,6 @@ gstreamerSupport ? false, gst_all_1, harfbuzz, - OpenGL, }: stdenv.mkDerivation rec { @@ -100,13 +99,11 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base ]; - buildInputs = - lib.optionals pangoSupport [ - pango - cairo - harfbuzz - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; + buildInputs = lib.optionals pangoSupport [ + pango + cairo + harfbuzz + ]; env = { diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index 6a31479b316d..f90b17c72c05 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - darwin, # Accelerate llvmPackages, # openmp withMkl ? false, mkl, @@ -80,11 +79,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp - darwin.apple_sdk.frameworks.Accelerate - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreVideo ]; passthru.tests = { diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix index 7b85ec1a18d6..530e70732acf 100644 --- a/pkgs/development/libraries/discord-rpc/default.nix +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -5,7 +5,6 @@ fetchpatch, cmake, rapidjson, - AppKit, buildExamples ? false, }: @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ rapidjson - ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; + ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=true" diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index c5dde2033dc3..82ec5ee5e926 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -19,7 +19,6 @@ withVoikko ? true, withAppleSpell ? stdenv.hostPlatform.isDarwin, - Cocoa, }: assert withAppleSpell -> stdenv.hostPlatform.isDarwin; @@ -57,9 +56,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withVoikko [ libvoikko - ] - ++ lib.optionals withAppleSpell [ - Cocoa ]; checkInputs = [ diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix index 6e851c66e077..6df8c0821963 100644 --- a/pkgs/development/libraries/fltk/common.nix +++ b/pkgs/development/libraries/fltk/common.nix @@ -22,15 +22,11 @@ libXcursor, libXft, libXrender, - ApplicationServices, - Carbon, - Cocoa, withGL ? true, libGL, libGLU, glew, - OpenGL, withCairo ? true, cairo, @@ -83,11 +79,7 @@ stdenv.mkDerivation { ]; buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Carbon - ] - ++ lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [ + lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [ libGL libGLU ] @@ -114,12 +106,6 @@ stdenv.mkDerivation { libXft libXrender ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ] - ++ lib.optionals (withGL && stdenv.hostPlatform.isDarwin) [ - OpenGL - ] ++ lib.optionals withCairo [ cairo ] diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 7caccd4a2881..b068e627f844 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -10,7 +10,6 @@ gperf, dejavu_fonts, autoreconfHook, - CoreFoundation, testers, }: @@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ expat - ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; + ]; propagatedBuildInputs = [ freetype diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index cfe531ccfa7b..24b81816aeaf 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -16,7 +16,6 @@ libXfixes, mesa, xinput, - CoreServices, }: stdenv.mkDerivation rec { @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { libGL libXfixes xinput - ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; + ]; doCheck = true; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 08c6b5a3a810..165d914c9ebd 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -10,8 +10,6 @@ libGL, libXi, libXmu, - GLUT, - Cocoa, }: stdenv.mkDerivation rec { @@ -25,19 +23,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-PpJGFWrlQ5sK7TJxQNoPujw1MxWRjphvblwOqnF+mSg="; }; - buildInputs = - [ - libusb1 - libglut - libGLU - libGL - libXi - libXmu - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - GLUT - Cocoa - ]; + buildInputs = [ + libusb1 + libglut + libGLU + libGL + libXi + libXmu + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 9c429091908c..e3209c5e4f1f 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -30,7 +30,6 @@ libwebp, luajit, openexr, - OpenCL, suitesparse, withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit, gimp, @@ -82,9 +81,6 @@ stdenv.mkDerivation (finalAttrs: { openexr suitesparse ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - OpenCL - ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ] diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index aa0df3aebc17..5916ca251dcf 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -5,7 +5,6 @@ stdenv, fetchurl, cmake, - darwin, doxygen, libidn2, libyaml, @@ -97,14 +96,11 @@ rec { yq ]; - buildInputs = - [ - getdns - libyaml - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; + buildInputs = [ + getdns + libyaml + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; postInstall = '' rm -r $out/share/doc diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index f6198467aeec..30dd8e2a0401 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -6,8 +6,6 @@ libXmu, libXi, libXext, - AGL, - OpenGL, testers, mesa, }: @@ -21,16 +19,12 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ AGL ] - else - [ - libXmu - libXi - libXext - ]; - propagatedBuildInputs = if stdenv.hostPlatform.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libXmu + libXi + libXext + ]; + propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGLU ]; # GL/glew.h includes GL/glu.h outputs = [ "out" diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 00a148c9df28..64b79757ccf5 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -8,7 +8,6 @@ libXmu, libXi, libXext, - OpenGL, enableEGL ? (!stdenv.hostPlatform.isDarwin), testers, mesa, @@ -50,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { libXi libXext ]; - propagatedBuildInputs = if stdenv.hostPlatform.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h + propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGLU ]; # GL/glew.h includes GL/glu.h cmakeDir = "cmake"; cmakeFlags = [ diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index cb7054fe3398..c8e250c9ef50 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -7,7 +7,6 @@ glib, libsigcxx30, gnome, - Cocoa, meson, ninja, }: @@ -34,10 +33,6 @@ stdenv.mkDerivation rec { glib # for glib-compile-schemas ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; - propagatedBuildInputs = [ glib libsigcxx30 diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 732c3d77c4e2..317de19f6703 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -7,7 +7,6 @@ glib, libsigcxx, gnome, - darwin, meson, ninja, }: @@ -33,13 +32,6 @@ stdenv.mkDerivation rec { gnum4 glib # for glib-compile-schemas ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - ] - ); propagatedBuildInputs = [ glib libsigcxx diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index c22826310b3f..ac45fc96e2b0 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -25,7 +25,6 @@ libunistring, withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit, - Security, # darwin Security.framework # certificate compression - only zlib now, more possible: zstd, brotli # for passthru.tests @@ -168,10 +167,7 @@ stdenv.mkDerivation rec { util-linux ]; - propagatedBuildInputs = - [ nettle ] - # Builds dynamically linking against gnutls seem to need the framework now. - ++ lib.optional isDarwin Security; + propagatedBuildInputs = [ nettle ]; inherit doCheck; # stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` breaks tests. diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 36a701fa16dd..7fa065408604 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -194,9 +194,6 @@ stdenv.mkDerivation (finalAttrs: { qtwayland ] ) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_gstreamer - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdrm libGL @@ -206,6 +203,9 @@ stdenv.mkDerivation (finalAttrs: { libiec61883 libgudev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_gstreamer + ] ++ lib.optionals enableWayland [ wayland ] diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 87b638ad76a4..0fd2d15f83f7 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -24,8 +24,6 @@ pkg-config, replaceVars, testers, - AppKit, - Cocoa, gdktarget ? if stdenv.hostPlatform.isDarwin then "quartz" else "x11", cupsSupport ? config.gtk2.cups or stdenv.hostPlatform.isLinux, xineramaSupport ? stdenv.hostPlatform.isLinux, @@ -103,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional cupsSupport cups ++ lib.optionals stdenv.hostPlatform.isDarwin [ libXdamage - AppKit - Cocoa ]; preConfigure = lib.optionalString ( diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 60e403d580e2..147d654be1ee 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -46,9 +46,6 @@ xineramaSupport ? stdenv.hostPlatform.isLinux, cupsSupport ? stdenv.hostPlatform.isLinux, cups, - AppKit, - Cocoa, - QuartzCore, broadwaySupport ? true, wayland-scanner, testers, @@ -139,9 +136,6 @@ stdenv.mkDerivation (finalAttrs: { (libepoxy.override { inherit x11Support; }) isocodes ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - ] ++ lib.optionals trackerSupport [ tinysparql ]; @@ -169,11 +163,6 @@ stdenv.mkDerivation (finalAttrs: { libXrender pango ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # explicitly propagated, always needed - Cocoa - QuartzCore - ] ++ lib.optionals waylandSupport [ libGL wayland diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 243ebdae7351..2a510fbaf527 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -16,8 +16,6 @@ icu, graphite2, harfbuzz, # The icu variant uses and propagates the non-icu one. - ApplicationServices, - CoreText, withCoreText ? false, withIcu ? false, # recommended by upstream as default, but most don't needed and it's big withGraphite2 ? true, # it is small and major distros do include it @@ -91,15 +89,10 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_43 ] ++ lib.optional withIntrospection gobject-introspection; - buildInputs = - [ - glib - freetype - ] - ++ lib.optionals withCoreText [ - ApplicationServices - CoreText - ]; + buildInputs = [ + glib + freetype + ]; propagatedBuildInputs = lib.optional withGraphite2 graphite2 diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 831f3fec8b90..007e98379424 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -6,8 +6,6 @@ pkg-config, libusb1, udev, - Cocoa, - IOKit, testers, }: @@ -34,11 +32,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - IOKit - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 8619f3db1261..16d65969eefe 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -6,7 +6,6 @@ cmake, fetchFromGitHub, fetchpatch, - darwin, glfw, libGL, SDL2, @@ -80,12 +79,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.GameController - ]; - propagatedBuildInputs = lib.optionals IMGUI_LINK_GLVND [ libGL ] ++ lib.optionals IMGUI_BUILD_GLFW_BINDING [ glfw ] @@ -93,8 +86,7 @@ stdenv.mkDerivation rec { ++ lib.optionals IMGUI_BUILD_VULKAN_BINDING [ vulkan-headers vulkan-loader - ] - ++ lib.optionals IMGUI_BUILD_METAL_BINDING [ darwin.apple_sdk.frameworks.Metal ]; + ]; cmakeFlags = [ (lib.cmakeBool "IMGUI_BUILD_GLFW_BINDING" IMGUI_BUILD_GLFW_BINDING) diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index 1625421de09d..032d788e8882 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -4,9 +4,6 @@ fetchzip, fetchFromGitHub, cmake, - Cocoa, - OpenGL, - IOKit, }: let @@ -41,11 +38,6 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ - OpenGL - Cocoa - IOKit - ]; meta = { homepage = "https://irrlicht.sourceforge.net/"; diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index e7662019f5e6..13b82b900542 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -30,7 +30,6 @@ vtk, which, zlib, - Cocoa, enablePython ? false, enableRtk ? true, }: @@ -145,7 +144,6 @@ stdenv.mkDerivation { libuuid ] ++ lib.optionals (lib.versionAtLeast version "5.4") [ eigen ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals enablePython [ python ] ++ lib.optionals withVtk [ vtk ]; # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 56f8d9970997..b2b52e650295 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -21,10 +21,6 @@ libmicrohttpd, cjson, - CoreFoundation, - Security, - SystemConfiguration, - curl, jdk_headless, unzip, @@ -82,11 +78,6 @@ stdenv.mkDerivation { libedit pam ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - CoreFoundation - Security - SystemConfiguration - ] ++ lib.optionals (withCJSON) [ cjson ] ++ lib.optionals (withCapNG) [ libcap_ng ] ++ lib.optionals (withMicroHTTPD) [ libmicrohttpd ] diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 7a4df60f0ae5..90798e2af98c 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -4,7 +4,6 @@ fetchurl, bootstrap_cmds, byacc, # can also use bison, but byacc has fewer dependencies - darwin, keyutils, openssl, perl, @@ -95,14 +94,6 @@ stdenv.mkDerivation rec { ++ lib.optionals withLibedit [ libedit ] ++ lib.optionals withVerto [ libverto ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; - [ - libs.xpc - frameworks.Kerberos - ] - ); - sourceRoot = "krb5-${version}/src"; postPatch = diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 42d7be0c068c..b542d64b3859 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -18,8 +18,6 @@ gsettings-desktop-schemas, desktop-file-utils, xvfb-run, - AppKit, - Foundation, testers, }: @@ -65,15 +63,10 @@ stdenv.mkDerivation (finalAttrs: { "-Dtests=false" ]; - buildInputs = - [ - appstream - fribidi - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Foundation - ]; + buildInputs = [ + appstream + fribidi + ]; propagatedBuildInputs = [ gtk4 diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 25d52e369e47..88dbf48c8d51 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -8,9 +8,6 @@ libpulseaudio, alsa-lib, libcap, - CoreAudio, - CoreServices, - AudioUnit, usePulseAudio, }: @@ -53,11 +50,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libcap - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - CoreServices - AudioUnit ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 4771aee34807..9ab07b4dbfdb 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -5,7 +5,6 @@ pkg-config, fontconfig, autoreconfHook, - DiskArbitration, withJava ? false, jdk17, ant, @@ -44,10 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ fontconfig ] - ++ lib.optional withMetadata libxml2 - ++ lib.optional withFonts freetype - ++ lib.optional stdenv.hostPlatform.isDarwin DiskArbitration; + [ fontconfig ] ++ lib.optional withMetadata libxml2 ++ lib.optional withFonts freetype; propagatedBuildInputs = lib.optional withAACS libaacs; diff --git a/pkgs/development/libraries/libbtbb/default.nix b/pkgs/development/libraries/libbtbb/default.nix index 02175448c703..4e79116c6ab3 100644 --- a/pkgs/development/libraries/libbtbb/default.nix +++ b/pkgs/development/libraries/libbtbb/default.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, cmake, - CoreServices, }: stdenv.mkDerivation rec { @@ -17,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d"; }; - nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + nativeBuildInputs = [ cmake ]; # https://github.com/greatscottgadgets/libbtbb/issues/63 postPatch = '' diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index cdbe126abc48..524a5cb908e7 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -13,9 +13,6 @@ libvorbis, libcap, systemd, - Carbon, - CoreServices, - AppKit, withAlsa ? stdenv.hostPlatform.isLinux, alsa-lib, }: @@ -48,11 +45,6 @@ stdenv.mkDerivation rec { ]) ++ lib.optional (gtkSupport == "gtk2") gtk2-x11 ++ lib.optional (gtkSupport == "gtk3") gtk3-x11 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreServices - AppKit - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap systemd diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 93b3cb91ffc9..90a5782b3520 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -6,8 +6,6 @@ libcdio, pkg-config, libiconv, - IOKit, - DiskArbitration, }: stdenv.mkDerivation rec { @@ -29,12 +27,8 @@ stdenv.mkDerivation rec { [ libcdio ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - IOKit - DiskArbitration ]; - propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin DiskArbitration; - configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-ld-version-script" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index c886f0d8fba7..49a4d14e63a6 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -4,7 +4,6 @@ fetchurl, libraw1394, libusb1, - CoreServices, }: stdenv.mkDerivation rec { @@ -21,10 +20,7 @@ stdenv.mkDerivation rec { "trivialautovarinit" ]; - buildInputs = - [ libusb1 ] - ++ lib.optional stdenv.hostPlatform.isLinux libraw1394 - ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; + buildInputs = [ libusb1 ] ++ lib.optional stdenv.hostPlatform.isLinux libraw1394; meta = with lib; { description = "Capture and control API for IIDC compliant cameras"; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index e36402b68b5a..58545dd08127 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -12,7 +12,6 @@ libGL, libX11, pkg-config, - OpenGL, runtimeShell, withXorg ? true, testers, @@ -52,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withXorg [ libX11 libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; + ]; configureFlags = [ "--enable-ILU" diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index d0195e668993..bd0db914c25a 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -2,15 +2,12 @@ lib, stdenv, fetchurl, - IOKit, }: stdenv.mkDerivation rec { pname = "libdvdcss"; version = "1.4.3"; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin IOKit; - src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; sha256 = "sha256-IzzJL13AHF06lvWzWCvn1c7lo1pS06CBWHRdPYYHAHk="; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 64e2dbdc0892..d295921204dc 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,7 +9,6 @@ pkg-config, libiconv, libxcrypt, - ApplicationServices, }: stdenv.mkDerivation { @@ -36,7 +35,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - ApplicationServices ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index dbb9fc8109ce..3ebfae842d77 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -16,7 +16,6 @@ guile, python, qtbase, - darwin, }: stdenv.mkDerivation { @@ -70,7 +69,7 @@ stdenv.mkDerivation { guile python qtbase - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; + ]; preConfigure = '' substituteInPlace studio/src/guile/interpreter.cpp \ diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 0bd3e6e14325..dce75c2c923c 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -3,8 +3,6 @@ stdenv, fetchurl, libusb-compat-0_1, - Security, - IOKit, libobjc, }: @@ -21,8 +19,6 @@ stdenv.mkDerivation rec { [ libusb-compat-0_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - Security - IOKit ]; propagatedBuildInputs = [ libusb-compat-0_1 ]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 58afe09e7cd4..4e98f25e1f79 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -5,7 +5,6 @@ pkg-config, glib, cairo, - Carbon, fontconfig, libtiff, giflib, @@ -60,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { libpng libXrender libexif - ] ++ lib.optional stdenv.hostPlatform.isDarwin Carbon; + ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 71cb12e6afd8..0d7ea5907062 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -11,7 +11,6 @@ openssl, pcre2, libiconv, - Security, staticBuild ? stdenv.hostPlatform.isStatic, # for passthru.tests libgit2-glib, @@ -72,16 +71,13 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - zlib - libssh2 - openssl - pcre2 - llhttp - ] - ++ lib.optional withGssapi krb5 - ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ + zlib + libssh2 + openssl + pcre2 + llhttp + ] ++ lib.optional withGssapi krb5; propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index ce75d6c0fe83..33e9e183c859 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -14,8 +14,6 @@ runtimeShell, lib, pkg-config, - CFNetwork, - CoreServices, }: stdenv.mkDerivation rec { @@ -59,11 +57,7 @@ stdenv.mkDerivation rec { libusb1 ] ++ lib.optional avahiSupport avahi - ++ lib.optional stdenv.hostPlatform.isLinux libaio - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CFNetwork - CoreServices - ]; + ++ lib.optional stdenv.hostPlatform.isLinux libaio; cmakeFlags = [ diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 416ebdb1e21a..715fb7dc6fcd 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -11,8 +11,6 @@ libtasn1, libusbmuxd, libimobiledevice-glue, - SystemConfiguration, - CoreFoundation, unstableGitUpdater, }: @@ -48,19 +46,14 @@ stdenv.mkDerivation rec { pkg-config ]; - propagatedBuildInputs = - [ - openssl - libgcrypt - libplist - libtasn1 - libusbmuxd - libimobiledevice-glue - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - SystemConfiguration - CoreFoundation - ]; + propagatedBuildInputs = [ + openssl + libgcrypt + libplist + libtasn1 + libusbmuxd + libimobiledevice-glue + ]; outputs = [ "out" diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index fcf1cdec33b3..4b5e409198ac 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -5,7 +5,6 @@ fetchurl, pkg-config, gtk2, - Carbon, useGTK ? config.libiodbc.gtk or false, }: @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals useGTK [ gtk2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Carbon; + buildInputs = lib.optionals useGTK [ gtk2 ]; preBuild = '' export NIX_LDFLAGS_BEFORE="-rpath $out/lib" diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 0eb07279b716..7530d998e51e 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -9,7 +9,6 @@ fftwSinglePrec, libsamplerate, qtbase, - darwin, }: stdenv.mkDerivation { @@ -40,7 +39,7 @@ stdenv.mkDerivation { fftwSinglePrec libsamplerate qtbase - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString ( stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 3062a91186cc..8ab47058aef9 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, glib, - Carbon, - AppKit, }: stdenv.mkDerivation rec { @@ -25,10 +23,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - AppKit - ]; propagatedBuildInputs = [ glib ]; meta = with lib; { diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 7d37cb623576..4193e5e65e0c 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -5,7 +5,6 @@ texinfo, alsa-lib, libpulseaudio, - CoreAudio, }: let @@ -21,10 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-re9iFIY1FqSltE6/LHHvhOzf6zRElz2suscJEcm8Z+k="; }; - buildInputs = - [ texinfo ] - ++ optional stdenv.hostPlatform.isLinux alsa-lib - ++ optional stdenv.hostPlatform.isDarwin CoreAudio; + buildInputs = [ texinfo ] ++ optional stdenv.hostPlatform.isLinux alsa-lib; propagatedBuildInputs = optional stdenv.hostPlatform.isLinux libpulseaudio; outputs = [ diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index 4a63de87e643..8e861f455809 100644 --- a/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -13,10 +13,6 @@ libXrandr, pkg-config, zlib, - Accelerate, - AGL, - Cocoa, - Foundation, }: stdenv.mkDerivation (finalAttrs: { @@ -48,10 +44,6 @@ stdenv.mkDerivation (finalAttrs: { ++ ( if stdenv.hostPlatform.isDarwin then [ - Accelerate - AGL - Cocoa - Foundation zlib ] else diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 546765969cc2..8479ae9dcd75 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -10,7 +10,6 @@ boost, icu, protobuf, - Foundation, }: stdenv.mkDerivation (finalAttrs: { @@ -37,15 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - boost - icu - protobuf - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; + buildInputs = [ + boost + icu + protobuf + ]; cmakeDir = "../cpp"; diff --git a/pkgs/development/libraries/librasterlite2/default.nix b/pkgs/development/libraries/librasterlite2/default.nix index 91086083f951..25f7da35280b 100644 --- a/pkgs/development/libraries/librasterlite2/default.nix +++ b/pkgs/development/libraries/librasterlite2/default.nix @@ -26,7 +26,6 @@ proj, sqlite, zstd, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { proj sqlite zstd - ] ++ lib.optional stdenv.hostPlatform.isDarwin ApplicationServices; + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 0a53591d6908..97749fc5ea0b 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -5,7 +5,6 @@ zlib, openssl, cmake, - SystemConfiguration, }: stdenv.mkDerivation rec { @@ -18,14 +17,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4="; }; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - SystemConfiguration - ]; + buildInputs = [ + openssl + zlib + ]; nativeBuildInputs = [ cmake ]; makeFlags = diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index cc3931abc499..736495be423c 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,7 +15,6 @@ libxml2, bzip2, dav1d, - Foundation, rustPlatform, rustc, cargo-c, @@ -137,9 +136,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withIntrospection [ vala # for share/vala/Makefile.vapigen - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 0c91b3e13d8b..dd7e36b7da31 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -13,8 +13,6 @@ libopus, libvorbis, alsa-lib, - Carbon, - AudioToolbox, # for passthru.tests audacity, @@ -43,20 +41,14 @@ stdenv.mkDerivation rec { pkg-config python3 ]; - buildInputs = - [ - flac - lame - libmpg123 - libogg - libopus - libvorbis - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - AudioToolbox - ]; + buildInputs = [ + flac + lame + libmpg123 + libogg + libopus + libvorbis + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 6dab2ea2c6f0..4c8c5fbf49a6 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -6,7 +6,6 @@ alsa-lib, libjack2, libpulseaudio, - AudioUnit, }: stdenv.mkDerivation rec { @@ -27,8 +26,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib - ] - ++ lib.optional stdenv.hostPlatform.isDarwin AudioUnit; + ]; cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DBUILD_TESTS=OFF" diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 3dd55d1e690a..1b7429bc482d 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - IOKit, }: stdenv.mkDerivation rec { @@ -14,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-VoiqSmhVR9cXSoo3PqnY7pJ+dm48wwK97jRSPCxdbBE="; }; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin IOKit; - meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; description = "Library that provides cross platforms access to statistics about the running system"; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 46be24a05630..0ee54f7c45a1 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -5,7 +5,6 @@ cmake, pkg-config, gtk3, - Cocoa, }: let @@ -26,9 +25,7 @@ stdenv.mkDerivation rec { cmake pkg-config ]; - propagatedBuildInputs = - lib.optional stdenv.hostPlatform.isLinux gtk3 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux gtk3; postPatch = '' substituteInPlace darwin/text.m unix/text.c \ diff --git a/pkgs/development/libraries/libuiohook/default.nix b/pkgs/development/libraries/libuiohook/default.nix index e39c2addfac4..709e75bc8ec7 100644 --- a/pkgs/development/libraries/libuiohook/default.nix +++ b/pkgs/development/libraries/libuiohook/default.nix @@ -5,9 +5,6 @@ nixosTests, cmake, pkg-config, - AppKit, - ApplicationServices, - Carbon, libX11, libxkbcommon, xinput, @@ -30,29 +27,23 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - AppKit - ApplicationServices - Carbon - ] - else - [ - libX11 - libxkbcommon - xinput - ] - ++ (with xorg; [ - libXau - libXdmcp - libXi - libXinerama - libXt - libXtst - libXext - libxkbfile - ]); + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) ( + [ + libX11 + libxkbcommon + xinput + ] + ++ (with xorg; [ + libXau + libXdmcp + libXi + libXinerama + libXt + libXtst + libXext + libxkbfile + ]) + ); outputs = [ "out" diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index f5283b623ecb..216e9b57c638 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -9,8 +9,6 @@ stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isAndroid, udev, libobjc, - IOKit, - Security, withExamples ? false, withStatic ? false, withDocs ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, @@ -40,8 +38,6 @@ stdenv.mkDerivation rec { lib.optional enableUdev udev ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - IOKit - Security ]; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index d3ba36cff93a..fea3d431a539 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -22,8 +22,6 @@ withPulseAudio ? stdenv.hostPlatform.isLinux, libpulseaudio, withCoreAudio ? stdenv.hostPlatform.isDarwin, - CoreAudio, - AudioToolbox, withLibao ? true, libao, @@ -63,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withALSA [ alsa-lib ] ++ lib.optionals withPulseAudio [ libpulseaudio ] - ++ lib.optionals withCoreAudio [ - CoreAudio - AudioToolbox - ] ++ lib.optionals withLibao [ libao ]; cmakeFlags = diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 7d5b81ad8c24..1acf1f761392 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -62,8 +62,6 @@ gmp, libiconv, qemu, - Carbon, - AppKit, # Options enableCeph ? false, @@ -237,8 +235,6 @@ stdenv.mkDerivation rec { util-linux ] ++ lib.optionals isDarwin [ - AppKit - Carbon gmp libiconv ] diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 29dd62948001..b016e19af766 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -10,7 +10,6 @@ libpng, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, - Carbon, }: stdenv.mkDerivation rec { @@ -51,9 +50,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withSystemd [ systemd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 60708ed7a4a2..e1556ba78c80 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -14,7 +14,6 @@ libxml2, libuuid, openssl, - darwin, }: stdenv.mkDerivation rec { @@ -47,9 +46,6 @@ stdenv.mkDerivation rec { glib icu libuuid - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation ]; postPatch = diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix index de57c2178568..9f14b5d79300 100644 --- a/pkgs/development/libraries/mesa/darwin.nix +++ b/pkgs/development/libraries/mesa/darwin.nix @@ -11,7 +11,6 @@ ninja, pkg-config, python3Packages, - Xplugin, xorg, zlib, }: @@ -46,7 +45,6 @@ stdenv.mkDerivation { buildInputs = [ libxml2 # should be propagated from libllvm llvmPackages.libllvm - Xplugin xorg.libX11 xorg.libXext xorg.libXfixes diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 5053e998158c..9997857befc4 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -22,7 +22,6 @@ rubberband, sox, vid-stab, - darwin, cudaSupport ? config.cudaSupport, cudaPackages ? { }, enableJackrack ? stdenv.hostPlatform.isLinux, @@ -91,9 +90,6 @@ stdenv.mkDerivation rec { sox vid-stab ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Accelerate - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/development/libraries/mongocxx/default.nix index f63cbaaf255f..947da3423261 100644 --- a/pkgs/development/libraries/mongocxx/default.nix +++ b/pkgs/development/libraries/mongocxx/default.nix @@ -8,7 +8,6 @@ cmake, validatePkgConfig, testers, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { mongoc openssl cyrus_sasl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index fdc2f1f7b7ed..a1b153b5dfed 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -9,7 +9,6 @@ openssh, hwloc, python3, - darwin, # either libfabric or ucx work for ch4backend on linux. On darwin, neither of # these libraries currently build so this argument is ignored on Darwin. ch4backend, @@ -82,8 +81,7 @@ stdenv.mkDerivation rec { hwloc ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend - ++ lib.optional pmixSupport pmix - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation; + ++ lib.optional pmixSupport pmix; # test_double_serializer.test fails on darwin doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index e7d326e446ac..d574bbc73e1f 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -13,7 +13,6 @@ libGL, libGLU, libX11, - Cocoa, }: let @@ -55,9 +54,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa ]; # Tools are disabled due to compilation failures. diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index c354ed018946..347d2a8f0a6d 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - CoreServices, curlHTTP3, }: @@ -26,9 +25,6 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - ]; cmakeFlags = [ (lib.cmakeBool "ENABLE_STATIC_LIB" false) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 61d69acc6077..236cdff3d954 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - CoreServices, buildPackages, nixosTests, }: @@ -47,8 +46,6 @@ stdenv.mkDerivation rec { moveToOutput share "$dev" # just aclocal ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - enableParallelBuilding = true; passthru.tests = { diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 9ec54c3828da..6b473fcf1b85 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -26,8 +26,6 @@ libXt, libXxf86vm, xorgproto, - # darwin - darwin, # optional withNvidiaCg ? false, nvidia_cg_toolkit, @@ -98,9 +96,6 @@ let libXxf86vm xorgproto ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals withNvidiaCg [ nvidia_cg_toolkit ]; diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index b6ddc5ebbf63..6b5d4c32b663 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -4,9 +4,6 @@ fetchFromGitHub, cmake, libX11, - Cocoa, - IOKit, - Kernel, }: stdenv.mkDerivation rec { @@ -22,13 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - IOKit - Kernel - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/development/libraries/okapi/default.nix b/pkgs/development/libraries/okapi/default.nix index e3a71e97f55f..427a95123084 100644 --- a/pkgs/development/libraries/okapi/default.nix +++ b/pkgs/development/libraries/okapi/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchurl, - Security, }: rustPlatform.buildRustPackage rec { @@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec { cargoVendorDir = "vendor"; doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - postInstall = '' cp -r include $out ''; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index f4099522edf9..5c8830ee24fc 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -4,7 +4,6 @@ lib, fetchFromGitHub, fetchpatch, - Foundation, abseil-cpp_202407, cmake, cpuinfo, @@ -166,7 +165,6 @@ effectiveStdenv.mkDerivation rec { ] ) ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ - Foundation libiconv ] ++ lib.optionals cudaSupport ( diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index b41d1d70e17f..c51300ebfb79 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -13,9 +13,6 @@ pipewire, pulseSupport ? !stdenv.hostPlatform.isDarwin, libpulseaudio, - CoreServices, - AudioUnit, - AudioToolbox, nix-update-script, }: @@ -42,12 +39,7 @@ stdenv.mkDerivation rec { lib.optional alsaSupport alsa-lib ++ lib.optional dbusSupport dbus ++ lib.optional pipewireSupport pipewire - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - AudioUnit - AudioToolbox - ]; + ++ lib.optional pulseSupport libpulseaudio; cmakeFlags = [ diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 00e041aafb0a..61e1d24ab3dc 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -12,10 +12,6 @@ # Only required on Linux glew, libglut, - # Only required on Darwin - Carbon, - GLUT, - Cocoa, # Python bindings pythonBindings ? true, # Python bindings python3Packages, @@ -63,11 +59,6 @@ stdenv.mkDerivation rec { glew libglut ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - GLUT - Cocoa - ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 3a73ea8c7850..df7ef53e02f5 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -10,7 +10,6 @@ libXext, libX11, qmake, - GLUT, fixDarwinDylibNames, }: @@ -33,8 +32,7 @@ stdenv.mkDerivation rec { libXmu libXext libX11 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin GLUT; + ]; doCheck = false; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 39478e3e92b2..cecc8ee47b0b 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - Security, cmake, pkg-config, asio, @@ -51,9 +50,6 @@ stdenv.mkDerivation { restinio llhttp openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security ]; cmakeFlags = diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index df568d649494..ef95cbcdb125 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -16,11 +16,6 @@ libxml2, pcre, zlib, - AGL, - Accelerate, - Carbon, - Cocoa, - Foundation, boost, jpegSupport ? true, libjpeg, @@ -116,14 +111,6 @@ stdenv.mkDerivation rec { ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio ++ lib.optionals withExamples [ fltk ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AGL - Accelerate - Carbon - Cocoa - Foundation - ] ++ lib.optional (restSupport || colladaSupport) boost; patches = [ diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index aebce7dc1210..1a9ac1e23db6 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -7,7 +7,6 @@ harfbuzz, libintl, libthai, - darwin, fribidi, gnome, gi-docgen, @@ -61,20 +60,10 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection ]; - buildInputs = - [ - fribidi - libthai - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - ApplicationServices - Carbon - CoreGraphics - CoreText - ] - ); + buildInputs = [ + fribidi + libthai + ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index c53c31e32c1e..7f6bcfdbf32b 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -13,8 +13,6 @@ libpng, libtiff, eigen, - Carbon, - Cocoa, }: stdenv.mkDerivation rec { @@ -34,21 +32,16 @@ stdenv.mkDerivation rec { doxygen ]; - buildInputs = - [ - libGL - glew - xorg.libX11 - ffmpeg - libjpeg - libpng - libtiff - eigen - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - ]; + buildInputs = [ + libGL + glew + xorg.libX11 + ffmpeg + libjpeg + libpng + libtiff + eigen + ]; # The tests use cmake's findPackage to find the installed version of # pangolin, which isn't what we want (or available). diff --git a/pkgs/development/libraries/pangomm/2.42.nix b/pkgs/development/libraries/pangomm/2.42.nix index e855aeb3659b..2530dda54013 100644 --- a/pkgs/development/libraries/pangomm/2.42.nix +++ b/pkgs/development/libraries/pangomm/2.42.nix @@ -10,7 +10,6 @@ glibmm, cairomm, gnome, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -36,16 +35,12 @@ stdenv.mkDerivation rec { "dev" ]; - nativeBuildInputs = - [ - pkg-config - meson - ninja - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; propagatedBuildInputs = [ pango glibmm diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index 79d65cfab329..efc9bd9d93fe 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -10,7 +10,6 @@ glibmm_2_68, cairomm_1_16, gnome, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -27,16 +26,12 @@ stdenv.mkDerivation rec { hash = "sha256-U59apg6b3GuVW7RI4qYswUVidE32kCWAQPu3S/iFdV0="; }; - nativeBuildInputs = - [ - pkg-config - meson - ninja - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; propagatedBuildInputs = [ pango diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 9504a5ba9d19..3b4dcc9f0a7f 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -10,7 +10,6 @@ glibmm, cairomm, gnome, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -27,16 +26,12 @@ stdenv.mkDerivation rec { "dev" ]; - nativeBuildInputs = - [ - pkg-config - meson - ninja - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; propagatedBuildInputs = [ pango glibmm diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index fd298709181e..e7bce66d8175 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -8,7 +8,6 @@ asio, catch2, spdlog, - IOKit, udev, }: @@ -57,9 +56,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index b23e6bbafd72..ee526bffeb26 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -5,7 +5,6 @@ cmake, doxygen, zlib, - Foundation, }: let @@ -31,7 +30,7 @@ let doxygen ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + buildInputs = [ zlib ]; doInstallCheck = true; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 7a0ae2cbdf12..f5ebcf89d724 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -7,7 +7,6 @@ lhapdf, root5, zlib, - Cocoa, }: stdenv.mkDerivation rec { @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { lhapdf root5 zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; patches = [ ./bad_code.patch diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index d49b8da211d8..dcc8ca518051 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -6,7 +6,6 @@ pkg-config, enableWX ? false, wxGTK32, - Cocoa, enableXWin ? false, xorg, enablePNG ? false, @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { buildInputs = lib.optional enableWX wxGTK32 - ++ lib.optional (enableWX && stdenv.hostPlatform.isDarwin) Cocoa ++ lib.optional enableXWin xorg.libX11 ++ lib.optionals enablePNG [ cairo diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 9afbb6018aeb..3806a1be2d52 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -5,11 +5,6 @@ unzip, cmake, alsa-lib, - Carbon, - CoreAudio, - CoreFoundation, - CoreMIDI, - CoreServices, }: stdenv.mkDerivation rec { @@ -46,17 +41,9 @@ stdenv.mkDerivation rec { unzip cmake ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreAudio - CoreFoundation - CoreMIDI - CoreServices - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index e496a537c926..01e3168b30c9 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -6,7 +6,6 @@ qmake, qtbase, qtmultimedia, - utmp, }: stdenv.mkDerivation { @@ -27,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ qtbase qtmultimedia - ] ++ lib.optional stdenv.hostPlatform.isDarwin utmp; + ]; patches = [ # Changes required to make it compatible with lomiri-terminal-app diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 5ad105a64bac..fde3c71b4564 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -6,8 +6,6 @@ pkg-config, qtbase, qttools, - CoreFoundation, - Security, libsecret, }: @@ -32,16 +30,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ] # for finding libsecret ; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] - ++ [ - qtbase - qttools - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] ++ [ + qtbase + qttools + ]; doInstallCheck = true; diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index 98cf154ec1e6..af7cf9108cac 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -9,10 +9,6 @@ pkg-config, webkitgtk_4_0, xorg, - WebKit, - MetalKit, - CoreAudioKit, - simd, }: stdenv.mkDerivation rec { pname = "rnnoise-plugin"; @@ -45,12 +41,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ webkitgtk_4_0 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - WebKit - MetalKit - CoreAudioKit - simd ]; meta = with lib; { diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index efc6eee5c463..eb758bc1541a 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, itk, - Cocoa, }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + buildInputs = [ itk ]; doCheck = !stdenv.hostPlatform.isDarwin; # usual dynamic linker issues diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 8bd4297fb95b..463f36deca47 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -10,10 +10,6 @@ python3, ocl-icd, opencl-headers, - Accelerate, - CoreGraphics, - CoreVideo, - OpenCL, }: stdenv.mkDerivation rec { @@ -60,15 +56,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ocl-icd opencl-headers - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreVideo ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - OpenCL - ]; strictDeps = true; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index bb9a91be24d9..5c649e913491 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -5,13 +5,9 @@ sqlite, libpq, boost, - darwin, lib, stdenv, }: -let - inherit (darwin.apple_sdk_11_0.frameworks) Kerberos; -in stdenv.mkDerivation rec { pname = "soci"; version = "4.0.2"; @@ -39,15 +35,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = - [ - sqlite - libpq - boost - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Kerberos - ]; + buildInputs = [ + sqlite + libpq + boost + ]; meta = with lib; { description = "Database access library for C++"; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index d70bd95bef04..0042c50b1dce 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -7,7 +7,6 @@ openssl, pkg-config, autoreconfHook, - SystemConfiguration, }: stdenv.mkDerivation rec { @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin SystemConfiguration; + ]; nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index e8f8e75f8fd8..bed06c618693 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - Carbon, fetchzip, libGL, libX11, @@ -16,16 +15,10 @@ stdenv.mkDerivation { sha256 = "1c05nwbnfdgwaz8ywn7kg2xrcvrcbpdyhcfkkiiwk69zvil0pbgd"; }; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - Carbon - ] - else - [ - libGL - libX11 - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGL + libX11 + ]; buildPhase = '' cd src diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 6ee5391451c7..dfdfa5ee4985 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -5,9 +5,6 @@ fetchpatch, ncurses, alsa-lib, - CoreServices, - AudioUnit, - Cocoa, }: stdenv.mkDerivation rec { @@ -33,11 +30,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - AudioUnit - Cocoa ]; makeFlags = [ diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 91ebe63bebe7..64c9708594e8 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -5,7 +5,6 @@ unzip, sqlite, tcl, - Foundation, }: let @@ -31,7 +30,7 @@ let }; nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; + buildInputs = [ tcl ]; makeFlags = [ makeTarget ]; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 9fb40ddb259d..0cf61be8d384 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - Carbon, libjpeg, libpng, withJpegSupport ? true, # support jpeg output @@ -17,10 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-CSA8ECMRFJ9d9cw2dAn5bHJXQmZtGcJNtbqZTVqBpvU="; }; buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - ] - ++ lib.optionals withJpegSupport [ + lib.optionals withJpegSupport [ libjpeg ] ++ lib.optionals withPngSupport [ diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index e9977ff75160..39edf55b76e9 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -4,7 +4,6 @@ cctools, cmake, fetchFromGitHub, - IOKit, pkg-config, }: @@ -28,8 +27,6 @@ stdenv.mkDerivation rec { cctools ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; - # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 8283a89095c5..3a15b69d453a 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -6,9 +6,6 @@ pkg-config, boost, lapack, - Accelerate, - CoreGraphics, - CoreVideo, }: stdenv.mkDerivation rec { @@ -30,16 +27,10 @@ stdenv.mkDerivation rec { pkg-config cmake ]; - buildInputs = - [ - boost - lapack - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreVideo - ]; + buildInputs = [ + boost + lapack + ]; doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index 6647f4250444..b64d19521905 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, fetchpatch, - darwin, autoreconfHook, pkg-config, }: @@ -53,10 +52,6 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ ApplicationServices ] - ); - patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index a7ed8c8ea0a2..e2d51a9e6606 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitLab, fetchurl, - darwin, abseil-cpp, meson, ninja, @@ -46,14 +45,6 @@ stdenv.mkDerivation rec { abseil-cpp ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - ApplicationServices - Foundation - ] - ); - env = lib.optionalAttrs stdenv.hostPlatform.isx86_32 { # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 NIX_CFLAGS_COMPILE = "-msse2"; diff --git a/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix index 606dd201f324..41e2d95914c9 100644 --- a/pkgs/development/libraries/wiiuse/default.nix +++ b/pkgs/development/libraries/wiiuse/default.nix @@ -6,8 +6,6 @@ cmake, bluez, libobjc, - Foundation, - IOBluetooth, }: stdenv.mkDerivation rec { @@ -44,8 +42,6 @@ stdenv.mkDerivation rec { lib.optionals stdenv.hostPlatform.isLinux [ bluez ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - Foundation - IOBluetooth ]; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 5433a09dc955..4f5c7f90bcf4 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -5,8 +5,6 @@ writeTextFile, cmake, alsa-lib, - OpenAL, - CoreAudioKit, freepats, }: @@ -26,15 +24,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = - lib.optionals stdenv.buildPlatform.isLinux [ - alsa-lib - stdenv.cc.libc # couldn't find libm - ] - ++ lib.optionals stdenv.buildPlatform.isDarwin [ - OpenAL - CoreAudioKit - ]; + buildInputs = lib.optionals stdenv.buildPlatform.isLinux [ + alsa-lib + stdenv.cc.libc # couldn't find libm + ]; preConfigure = '' # https://github.com/Mindwerks/wildmidi/issues/236 diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index db808f96f1ed..bccd65d015f9 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - Security, autoreconfHook, util-linux, openssl, @@ -88,10 +87,6 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - nativeBuildInputs = [ autoreconfHook util-linux diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index 646188c4c694..1b3b79256ed1 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -11,8 +11,6 @@ yubikey-personalization, libyubikey, libykclient, - CoreServices, - SystemConfiguration, }: stdenv.mkDerivation rec { @@ -32,17 +30,12 @@ stdenv.mkDerivation rec { libxslt docbook_xsl ]; - buildInputs = - [ - pam - yubikey-personalization - libyubikey - libykclient - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - SystemConfiguration - ]; + buildInputs = [ + pam + yubikey-personalization + libyubikey + libykclient + ]; meta = with lib; { description = "Yubico PAM module"; diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index a9b7aaef9e77..c216e235a1a5 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -1,5 +1,4 @@ { - stdenv, fetchFromGitHub, buildLuarocksPackage, lua, @@ -7,7 +6,6 @@ lib, replaceVars, zenity, - AppKit, }: buildLuarocksPackage { @@ -33,8 +31,6 @@ buildLuarocksPackage { luarocksConfig.variables.LUA_LIBDIR = "${lua}/lib"; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; - postInstall = '' find $out -name nfd_zenity.so -execdir mv {} nfd.so \; ''; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index dfa3dc4c2460..6609200b9aef 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -64,25 +64,19 @@ final: prev: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.xcbuild ]; - buildInputs = - with pkgs; - [ - # required by sharp - # https://sharp.pixelplumbing.com/install - vips + buildInputs = with pkgs; [ + # required by sharp + # https://sharp.pixelplumbing.com/install + vips - libsecret - final.node-gyp-build - node-pre-gyp + libsecret + final.node-gyp-build + node-pre-gyp - pixman - cairo - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + pixman + cairo + pango + ]; # add newer node-addon-api to build sharp # https://github.com/lovell/sharp/issues/3920 @@ -119,16 +113,11 @@ final: prev: { keyoxide = prev.keyoxide.override { nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = - with pkgs; - [ - pixman - cairo - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreText - ]; + buildInputs = with pkgs; [ + pixman + cairo + pango + ]; }; makam = prev.makam.override { @@ -217,18 +206,13 @@ final: prev: { vega-cli = prev.vega-cli.override { nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = - with pkgs; - [ - node-pre-gyp - pixman - cairo - pango - libjpeg - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreText - ]; + buildInputs = with pkgs; [ + node-pre-gyp + pixman + cairo + pango + libjpeg + ]; }; vega-lite = prev.vega-lite.override { @@ -254,16 +238,11 @@ final: prev: { ]; # These dependencies are required by # https://github.com/Automattic/node-canvas. - buildInputs = - with pkgs; - [ - giflib - pixman - cairo - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreText - ]; + buildInputs = with pkgs; [ + giflib + pixman + cairo + pango + ]; }; } diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix index 1ee6783162b7..208671eb58ef 100644 --- a/pkgs/development/ocaml-modules/bjack/default.nix +++ b/pkgs/development/ocaml-modules/bjack/default.nix @@ -1,10 +1,7 @@ { lib, - stdenv, buildDunePackage, fetchFromGitHub, - Accelerate, - CoreAudio, dune-configurator, libsamplerate, libjack2, @@ -21,12 +18,7 @@ buildDunePackage rec { hash = "sha256-jIxxqBVWphWYyLh+24rTxk4WWfPPdGCvNdevFJEKw70="; }; - buildInputs = - [ dune-configurator ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreAudio - ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ libsamplerate libjack2 diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index baed712e9ac6..9c1073346ff0 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -7,7 +7,6 @@ dune-configurator, pkg-config, cairo, - ApplicationServices, }: buildDunePackage rec { @@ -26,7 +25,7 @@ buildDunePackage rec { buildInputs = [ cairo dune-configurator - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; + ]; doCheck = !( diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 70c981ad11cb..7e59b6402605 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -1,16 +1,12 @@ { - lib, buildDunePackage, dune-configurator, pkg-config, callPackage, - AudioToolbox, ffmpeg-base ? callPackage ./base.nix { }, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg, - stdenv, - VideoToolbox, }: buildDunePackage { @@ -21,12 +17,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ dune-configurator ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - VideoToolbox - ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 76eaea775669..88d0d8fb1dae 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -1,15 +1,11 @@ { - lib, buildDunePackage, dune-configurator, pkg-config, callPackage, - AudioToolbox, ffmpeg-base ? callPackage ./base.nix { }, ffmpeg-avutil, ffmpeg, - stdenv, - VideoToolbox, }: buildDunePackage { @@ -20,12 +16,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ dune-configurator ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - VideoToolbox - ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index 97bab8f5d38f..dca995a11932 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -1,21 +1,11 @@ { - lib, buildDunePackage, dune-configurator, pkg-config, callPackage, - AppKit, - AudioToolbox, - AVFoundation, - Cocoa, - CoreImage, - ForceFeedback, ffmpeg-base ? callPackage ./base.nix { }, ffmpeg-av, ffmpeg, - OpenGL, - stdenv, - VideoToolbox, }: buildDunePackage { @@ -26,18 +16,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ dune-configurator ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - AudioToolbox - AVFoundation - Cocoa - CoreImage - ForceFeedback - OpenGL - VideoToolbox - ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ffmpeg-av diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 0af5d888d025..547c45286b12 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -1,17 +1,11 @@ { - lib, buildDunePackage, dune-configurator, pkg-config, callPackage, - AppKit, - CoreImage, ffmpeg-base ? callPackage ./base.nix { }, ffmpeg-avutil, ffmpeg, - OpenGL, - stdenv, - VideoToolbox, }: buildDunePackage { @@ -22,14 +16,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ dune-configurator ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreImage - OpenGL - VideoToolbox - ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 213920a6a110..c3620bfcdf4e 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -1,12 +1,9 @@ { lib, - stdenv, buildDunePackage, dune-configurator, pkg-config, callPackage, - AudioToolbox, - VideoToolbox, ffmpeg-base ? callPackage ./base.nix { }, ffmpeg, }: @@ -19,12 +16,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ dune-configurator ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - VideoToolbox - ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index bc4eb6900976..46acde6eeedb 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -1,5 +1,4 @@ { - lib, buildDunePackage, dune-configurator, pkg-config, @@ -8,8 +7,6 @@ ffmpeg-avutil, ffmpeg-avcodec, ffmpeg, - stdenv, - VideoToolbox, }: buildDunePackage { @@ -20,7 +17,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index a5f07a13d967..a52132475082 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -1,5 +1,4 @@ { - lib, buildDunePackage, dune-configurator, pkg-config, @@ -7,8 +6,6 @@ ffmpeg-base ? callPackage ./base.nix { }, ffmpeg-avutil, ffmpeg, - stdenv, - VideoToolbox, }: buildDunePackage { @@ -19,7 +16,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index 5ab096a5a99c..387cf4bd63c4 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, buildDunePackage, pkg-config, gsl, - darwin, dune-configurator, }: @@ -27,9 +25,6 @@ buildDunePackage rec { dune-configurator gsl ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Accelerate - ]; meta = with lib; { homepage = "https://mmottl.github.io/gsl-ocaml/"; diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix index cbe55294443d..d23241088976 100644 --- a/pkgs/development/ocaml-modules/gstreamer/default.nix +++ b/pkgs/development/ocaml-modules/gstreamer/default.nix @@ -1,11 +1,8 @@ { lib, - stdenv, buildDunePackage, fetchFromGitHub, dune-configurator, - AppKit, - Foundation, pkg-config, glib, gst_all_1, @@ -23,12 +20,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ dune-configurator ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Foundation - ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 7593ce4858ea..2a15aecfe0c9 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -4,7 +4,6 @@ lib, makeWrapper, fetchzip, - Cocoa, ocaml, findlib, tcl, @@ -102,7 +101,7 @@ param.stdenv.mkDerivation { buildInputs = [ tcl tk - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; configureFlags = [ "--use-findlib" diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index db9853a60f03..d82525956943 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -1,8 +1,6 @@ { lib, - stdenv, fetchurl, - darwin, buildDunePackage, dune-configurator, lapack, @@ -28,7 +26,7 @@ buildDunePackage rec { propagatedBuildInputs = [ lapack blas - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; + ]; meta = with lib; { homepage = "https://mmottl.github.io/lacaml"; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 20737655bd21..43fead8c172e 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -3,8 +3,6 @@ stdenv, fetchFromGitLab, libvirt, - AppKit, - Foundation, autoreconfHook, pkg-config, ocaml, @@ -37,11 +35,6 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") ocaml ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - AppKit - ]; - strictDeps = true; buildFlags = [ diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index e57ebcb84479..092d3973db90 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -11,11 +11,6 @@ result, SDL2, pkg-config, - AudioToolbox, - Cocoa, - CoreAudio, - CoreVideo, - ForceFeedback, }: if lib.versionOlder ocaml.version "4.03" then @@ -47,19 +42,11 @@ else topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = - [ - SDL2 - ctypes - ctypes-foreign - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - Cocoa - CoreAudio - CoreVideo - ForceFeedback - ]; + propagatedBuildInputs = [ + SDL2 + ctypes + ctypes-foreign + ]; preConfigure = '' # The following is done to avoid an additional dependency (ncurses) diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 866de8be10ab..ddbc1abf3e91 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -9,7 +9,6 @@ curl, pcre2, libiconv, - darwin, php, }: @@ -32,19 +31,12 @@ buildPecl rec { env.NIX_CFLAGS_COMPILE = "-O2"; - nativeBuildInputs = - [ - cargo - rustc - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - rustPlatform.bindgenHook - rustPlatform.cargoSetupHook - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.rustPlatform.bindgenHook - darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook - ]; + nativeBuildInputs = [ + cargo + rustc + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + ]; buildInputs = [ @@ -52,8 +44,6 @@ buildPecl rec { pcre2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 4e92fec0749a..dca9082f6670 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -11,7 +11,6 @@ openssl, snappy, zlib, - darwin, }: buildPecl rec { @@ -37,8 +36,6 @@ buildPecl rec { pcre2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.Libsystem libiconv ]; diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix index 8a2e5a45f7f1..07d7368fd46c 100644 --- a/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/pkgs/development/php-packages/snuffleupagus/default.nix @@ -6,7 +6,6 @@ php, fetchFromGitHub, pcre2, - darwin, }: buildPecl rec { @@ -23,8 +22,6 @@ buildPecl rec { buildInputs = [ pcre2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.Libsystem libiconv ]; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 011c47f6c286..66e6f1377943 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -10,8 +10,6 @@ publicsuffix-list, pythonOlder, libiconv, - CoreFoundation, - Security, pytestCheckHook, toml, }: @@ -62,8 +60,6 @@ buildPythonPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreFoundation - Security ]; PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix index ea89adb37e19..dcde1697e26b 100644 --- a/pkgs/development/python-modules/audiotools/default.nix +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -3,10 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - stdenv, - AudioToolbox, - AudioUnit, - CoreServices, pkg-config, libmpg123, lame, @@ -31,22 +27,16 @@ buildPythonPackage { pkg-config ]; - buildInputs = - [ - libmpg123 # MP2/MP3 decoding - lame # MP3 encoding - twolame # MP2 encoding - opusfile # opus decoding - libopus # opus encoding - libvorbis # ogg encoding/decoding - libcdio # CD reading - libcdio-paranoia # CD reading - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - AudioUnit - CoreServices - ]; + buildInputs = [ + libmpg123 # MP2/MP3 decoding + lame # MP3 encoding + twolame # MP2 encoding + opusfile # opus decoding + libopus # opus encoding + libvorbis # ogg encoding/decoding + libcdio # CD reading + libcdio-paranoia # CD reading + ]; preConfigure = '' # need to change probe to yes because mp3lame is not reported in pkg-config diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index dc09c49df9b2..3d5adc3982ab 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -5,8 +5,6 @@ cmake, perl, stdenv, - CoreFoundation, - Security, pythonOlder, }: @@ -22,11 +20,6 @@ buildPythonPackage rec { hash = "sha256-qNY6fcxkhMXBZ1sxqNG2cmw9yFsTeW+xQ9+wByJgk14="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ]; - nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perl ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 7de70db2f22c..9e298088ab37 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -6,7 +6,6 @@ buildPythonPackage, cargo, chroma-hnswlib, - darwin, fastapi, fetchFromGitHub, grpcio, @@ -91,7 +90,7 @@ buildPythonPackage rec { buildInputs = [ openssl zstd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; dependencies = [ bcrypt diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 29e2664034f6..69eb6c9bc925 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -4,8 +4,6 @@ rustPlatform, cffi, libiconv, - stdenv, - darwin, buildPythonPackage, appdirs, pyyaml, @@ -39,7 +37,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ libiconv - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; propagatedBuildInputs = [ appdirs pyyaml diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 24041f83ea99..c358750961a4 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -19,7 +19,6 @@ pytestCheckHook, pythonOlder, rustPlatform, - Security, }: buildPythonPackage rec { @@ -57,7 +56,6 @@ buildPythonPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security libiconv ] ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index ad5a3150b064..dffc8a82ca19 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -9,8 +9,6 @@ # native darwin dependencies libiconv, - Security, - SystemConfiguration, # tests pytestCheckHook, @@ -53,8 +51,6 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security - SystemConfiguration ]; pythonImportsCheck = [ "css_inline" ]; diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index 3584e4be235f..07961a2e2075 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -10,8 +10,6 @@ protobuf, protoc, pyarrow, - Security, - SystemConfiguration, typing-extensions, pythonOlder, }: @@ -63,8 +61,6 @@ buildPythonPackage rec { [ protobuf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security - SystemConfiguration ]; dependencies = [ diff --git a/pkgs/development/python-modules/datalad-gooey/default.nix b/pkgs/development/python-modules/datalad-gooey/default.nix index fcc3fa376330..15942af641e5 100644 --- a/pkgs/development/python-modules/datalad-gooey/default.nix +++ b/pkgs/development/python-modules/datalad-gooey/default.nix @@ -3,9 +3,7 @@ lib, git, fetchFromGitHub, - darwin, setuptools, - stdenv, git-annex, pyside6, pyqtdarktheme, @@ -37,7 +35,7 @@ buildPythonPackage { datalad-next outdated datalad - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppleScriptKit ]; + ]; pythonRemoveDeps = [ "applescript" ]; diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index c072a5c82098..93b592d465d4 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -7,7 +7,6 @@ pyarrow-hotfix, openssl, stdenv, - darwin, libiconv, pkg-config, pytestCheckHook, @@ -45,8 +44,6 @@ buildPythonPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index 10e71d28cb2f..420f6186b36e 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -10,7 +10,6 @@ rustfmt, setuptools-rust, openssl, - Security, msgpack, fetchpatch, nixosTests, @@ -59,7 +58,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; propagatedBuildInputs = [ msgpack ]; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 1e5cf2bfe1b5..1684577b011d 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -13,7 +13,6 @@ decorator, # native dependencies - GSS, krb5-c, # C krb5 library, not PyPI krb5 # tests @@ -53,8 +52,6 @@ buildPythonPackage rec { dependencies = [ decorator ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ GSS ]; - # k5test is marked as broken on darwin doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix index f7b0bcf8d5d9..1683c9958e35 100644 --- a/pkgs/development/python-modules/hf-transfer/default.nix +++ b/pkgs/development/python-modules/hf-transfer/default.nix @@ -12,7 +12,6 @@ # buildInputs openssl, stdenv, - darwin, libiconv, }: @@ -47,8 +46,6 @@ buildPythonPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 059ca697011c..e38280b67f6d 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -10,7 +10,6 @@ hidapi, libusb1, udev, - darwin, }: buildPythonPackage rec { @@ -39,16 +38,7 @@ buildPythonPackage rec { HIDAPI_SYSTEM_HIDAPI = true; }; - propagatedBuildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreFoundation - IOKit - ] - ); + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev ]; pythonImportsCheck = [ "hid" ]; diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 0d9523fce9af..796d074481be 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -6,7 +6,6 @@ httpx, libiconv, nettle, - PCSC, pcsclite, pkg-config, pytestCheckHook, @@ -53,7 +52,6 @@ buildPythonPackage rec { [ nettle ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - PCSC libiconv ]; diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index 0cbc048ee670..a6e87f00f8c7 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, cryptography, @@ -16,7 +15,6 @@ setuptools-scm, tabulate, toml, - AppKit, }: buildPythonPackage rec { @@ -34,7 +32,7 @@ buildPythonPackage rec { buildInputs = [ setuptools setuptools-scm - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + ]; propagatedBuildInputs = [ cryptography click diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index a70c1930fc20..3137d1e594bb 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pkg-config, setuptools, pango, cython, - AppKit, pytest-cov-stub, pytestCheckHook, pythonOlder, @@ -29,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + buildInputs = [ pango ]; build-system = [ setuptools diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 2f4a925a2117..6ef74d0c3d3a 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -67,9 +67,6 @@ enableNbagg ? false, ipykernel, - # darwin - Cocoa, - # required for headless detection libX11, wayland, @@ -127,8 +124,7 @@ buildPythonPackage rec { ++ lib.optionals enableGtk3 [ cairo gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 0f86ee525000..c8bf9d91a1a7 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -1,14 +1,11 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, setuptools, miniaudio, cffi, pytestCheckHook, - AudioToolbox, - CoreAudio, }: let @@ -45,11 +42,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - CoreAudio - ]; - propagatedNativeBuildInputs = [ cffi ]; dependencies = [ cffi ]; diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index c0df2af0b81a..cd0725bc5eb6 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -6,7 +6,6 @@ rustPlatform, libiconv, fetchFromGitHub, - darwin, }: let pname = "nh3"; @@ -36,7 +35,6 @@ buildPythonPackage { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; pythonImportsCheck = [ "nh3" ]; diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 0d1c36df8028..138a9f93c1f5 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -4,7 +4,6 @@ boost, buildPythonPackage, cmake, - darwin, distutils, doxygen, draco, @@ -142,7 +141,7 @@ buildPythonPackage rec { libX11 libXt ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) + ++ lib.optionals withOsl [ osl ] ++ lib.optionals withUsdView [ qt6.qtbase ] ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix index 7c75393cbd45..1bbedf13c469 100644 --- a/pkgs/development/python-modules/primp/default.nix +++ b/pkgs/development/python-modules/primp/default.nix @@ -8,7 +8,6 @@ runCommand, boringssl, libiconv, - SystemConfiguration, gcc-unwrapped, python, fetchpatch, @@ -91,7 +90,6 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - SystemConfiguration ]; env.BORING_BSSL_PATH = boringssl-wrapper; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 84a994cc2d61..28e1a646b2a6 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -2,10 +2,8 @@ lib, stdenv, buildPythonPackage, - CoreFoundation, fetchPypi, setuptools, - IOKit, pytestCheckHook, python, pythonOlder, @@ -35,11 +33,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = - # workaround for https://github.com/NixOS/nixpkgs/issues/146760 - lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ CoreFoundation ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; - nativeCheckInputs = [ pytestCheckHook ]; # Segfaults on darwin: diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 649c72c0be2a..c814452c02b7 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -12,7 +12,6 @@ ninja, meson-python, - AppKit, fontconfig, freetype, libjpeg, @@ -105,7 +104,7 @@ buildPythonPackage rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + ]; nativeCheckInputs = [ numpy diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index ae16a5f5dd54..7e0ccf74f6c9 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -8,7 +7,6 @@ cffi, pytestCheckHook, pythonOlder, - ApplicationServices, }: buildPythonPackage rec { @@ -29,8 +27,6 @@ buildPythonPackage rec { dependencies = [ cffi ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; - preBuild = '' ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace ''; diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 4bd3f66f7d26..ca7a16e7d070 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -13,7 +13,6 @@ # dependencies xlib, evdev, - darwin, six, # tests @@ -52,14 +51,7 @@ buildPythonPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ evdev xlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - ApplicationServices - Quartz - ] - ); + ]; doCheck = false; # requires running X server diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index e15dde02e599..a841a73f4d91 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -14,7 +14,6 @@ # buildInputs opencl-headers, pybind11, - darwin, ocl-icd, # dependencies @@ -25,10 +24,6 @@ pytestCheckHook, }: -let - os-specific-buildInputs = - if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; -in buildPythonPackage rec { pname = "pyopencl"; version = "2025.1"; @@ -55,7 +50,7 @@ buildPythonPackage rec { buildInputs = [ opencl-headers pybind11 - ] ++ os-specific-buildInputs; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ocl-icd ]; dependencies = [ numpy diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index 8a53416c5fa5..aa1256a89d9e 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -11,7 +11,6 @@ openssl, pcsclite, stdenv, - darwin, libiconv, }: @@ -48,8 +47,6 @@ buildPythonPackage rec { pcsclite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/development/python-modules/pystatgrab/default.nix b/pkgs/development/python-modules/pystatgrab/default.nix index 942fe48d95b5..620552507729 100644 --- a/pkgs/development/python-modules/pystatgrab/default.nix +++ b/pkgs/development/python-modules/pystatgrab/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, cython, fetchFromGitHub, @@ -10,7 +9,6 @@ setuptools, unittestCheckHook, wheel, - darwin, }: buildPythonPackage rec { @@ -39,7 +37,7 @@ buildPythonPackage rec { buildInputs = [ libstatgrab - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); + ]; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 818eeb919b29..c1766b27c5bf 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -4,10 +4,6 @@ alabaster, alsa-lib, buildPythonPackage, - CoreAudio, - CoreMIDI, - CoreServices, - Foundation, cython, fetchPypi, flake8, @@ -46,12 +42,6 @@ buildPythonPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libjack2 alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - CoreMIDI - CoreServices - Foundation ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index fd4f0e8047ec..dac8bbbfd7b6 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -4,7 +4,6 @@ python, fetchFromGitHub, cmake, - Cocoa, fontconfig, freetype, libGL, @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { fontconfig numpy rapidjson - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; cmakeFlags = [ "-Wno-dev" diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index 1dba755dab02..15bbfb68829e 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -11,7 +11,6 @@ qcs-api-client-common, quil, rustPlatform, - darwin, libiconv, syrupy, }: @@ -50,8 +49,6 @@ buildPythonPackage rec { }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix index 72c501168091..b4b3fb195e6c 100644 --- a/pkgs/development/python-modules/raylib-python-cffi/default.nix +++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -1,5 +1,4 @@ { - stdenv, gcc, buildPythonPackage, fetchFromGitHub, @@ -11,21 +10,11 @@ raylib, physac, raygui, - darwin, lib, writers, raylib-python-cffi, }: -let - inherit (darwin.apple_sdk.frameworks) - OpenGL - Cocoa - IOKit - CoreFoundation - CoreVideo - ; -in buildPythonPackage rec { pname = "raylib-python-cffi"; version = "5.5.0.2"; @@ -60,21 +49,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyray" ]; - buildInputs = - [ - glfw - libffi - raylib - physac - raygui - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - OpenGL - Cocoa - IOKit - CoreFoundation - CoreVideo - ]; + buildInputs = [ + glfw + libffi + raylib + physac + raygui + ]; passthru.tests = import ./passthru-tests.nix { inherit src raylib-python-cffi writers; diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index cdb87a0c8657..5f7d980de4ef 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -5,9 +5,6 @@ fetchPypi, cython_0, alsa-lib, - CoreAudio, - CoreMIDI, - CoreServices, }: buildPythonPackage rec { @@ -25,13 +22,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ cython_0 ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - CoreMIDI - CoreServices - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; setupPyBuildFlags = [ "--from-cython" ]; diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 855457eb0195..5e53e2c793af 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -9,8 +9,6 @@ numpy, pkg-config, - # buildInputs - Accelerate, blas, lapack, @@ -45,14 +43,10 @@ buildPythonPackage rec { pkg-config ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ Accelerate ] - else - [ - blas - lapack - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + blas + lapack + ]; dependencies = [ numpy diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index 147303c49881..f04f62056a83 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -12,8 +12,6 @@ pytestCheckHook, cctools, xcodebuild, - ApplicationServices, - OpenGL, }: buildPythonPackage rec { @@ -69,11 +67,6 @@ buildPythonPackage rec { xcodebuild ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - OpenGL - ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pathops" ]; diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index ed5fdb5e71ea..df0cb72737f9 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -5,7 +5,6 @@ cargo, fetchFromGitHub, libiconv, - Foundation, rustPlatform, rustc, setuptools-rust, @@ -32,7 +31,6 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Foundation ]; nativeBuildInputs = [ setuptools-rust diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 96ed0b178f3d..f378389fc45f 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -79,9 +79,6 @@ sse42Support ? stdenv.hostPlatform.sse4_2Support, avx2Support ? stdenv.hostPlatform.avx2Support, fmaSupport ? stdenv.hostPlatform.fmaSupport, - # Darwin deps - Foundation, - Security, cctools, llvmPackages, }: @@ -339,10 +336,6 @@ let cudnnMerged ] ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - Security - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ nsync ]; # arbitrarily set to the current latest bazel version, overly careful diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 46decc51d931..89769859cdf7 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -7,11 +7,8 @@ setuptools, cython, certifi, - CFNetwork, cmake, - CoreFoundation, openssl, - Security, pytestCheckHook, pytest-asyncio, }: @@ -61,13 +58,7 @@ buildPythonPackage rec { cmake ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - CFNetwork - Security - ]; + buildInputs = [ openssl ]; dependencies = [ certifi ]; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index fb53613cf789..b04167f1e6db 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, @@ -9,7 +8,6 @@ setuptools, setuptools-scm, pytestCheckHook, - ApplicationServices, }: buildPythonPackage rec { @@ -39,8 +37,6 @@ buildPythonPackage rec { setuptools-scm ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "uharfbuzz" ]; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 5976e3249e2e..6eefdaa603e2 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -11,8 +11,6 @@ # native dependencies libuv, - CoreServices, - ApplicationServices, # tests psutil, @@ -46,12 +44,7 @@ buildPythonPackage rec { env.LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; - buildInputs = - [ libuv ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - ApplicationServices - ]; + buildInputs = [ libuv ]; nativeCheckInputs = [ pyopenssl diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix index c258cc774af1..2ca4717e7e6e 100644 --- a/pkgs/development/python-modules/webrtc-noise-gain/default.nix +++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix @@ -10,7 +10,6 @@ # native dependencies abseil-cpp, - darwin, # tests pytestCheckHook, @@ -43,9 +42,7 @@ buildPythonPackage rec { setuptools ]; - buildInputs = [ - abseil-cpp - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = [ abseil-cpp ]; pythonImportsCheck = [ "webrtc_noise_gain" ]; diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix index 56dde703451e..dc4fa38e9961 100644 --- a/pkgs/development/python-modules/zenoh/default.nix +++ b/pkgs/development/python-modules/zenoh/default.nix @@ -5,8 +5,6 @@ cargo, rustPlatform, rustc, - stdenv, - darwin, }: buildPythonPackage rec { @@ -33,8 +31,6 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - pythonImportsCheck = [ "zenoh" ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f8ab40aa3f1e..cb7bf4399fbc 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -25,7 +25,6 @@ let buildRPackage = pkgs.callPackage ./generic-builder.nix { inherit R; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation; inherit (pkgs) gettext gfortran; }; diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 99b5d8243027..141de70fbccc 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -5,8 +5,6 @@ libcxx, xvfb-run, util-linux, - Cocoa, - Foundation, gettext, gfortran, libiconv, @@ -32,8 +30,6 @@ stdenv.mkDerivation ( xvfb-run ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - Foundation gfortran libiconv ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 41cc80bc34e2..c1cd72394c8a 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -104,7 +104,6 @@ shared-mime-info, libthai, libdatrie, - CoreServices, DarwinTools, cctools, libtool, @@ -629,10 +628,6 @@ in ''; }; - hitimes = attrs: { - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - }; - hpricot = attrs: { dontBuild = false; patches = [ diff --git a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix index ad737f13a355..f072975cb5a6 100644 --- a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix +++ b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix @@ -1,12 +1,10 @@ { - stdenv, lib, fetchsvn, tcl, tcllib, tk, xorg, - darwin, }: tcl.mkTclDerivation rec { @@ -25,17 +23,10 @@ tcl.mkTclDerivation rec { "--with-tkinclude=${tk.dev}/include" ]; - buildInputs = - [ - xorg.libX11 - tcllib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - ] - ); + buildInputs = [ + xorg.libX11 + tcllib + ]; meta = { homepage = "https://sourceforge.net/projects/tkimg/"; diff --git a/pkgs/development/tools/amazon-qldb-shell/default.nix b/pkgs/development/tools/amazon-qldb-shell/default.nix index 6cd0c01ad20a..61a942bb021c 100644 --- a/pkgs/development/tools/amazon-qldb-shell/default.nix +++ b/pkgs/development/tools/amazon-qldb-shell/default.nix @@ -1,11 +1,9 @@ { - stdenv, lib, cmake, fetchFromGitHub, rustPlatform, testers, - Security, }: let @@ -25,7 +23,6 @@ let cmake rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index bf51057d1786..b2b1e69d1baa 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -6,7 +6,6 @@ openssl, stdenv, curl, - Security, }: rustPlatform.buildRustPackage rec { @@ -30,7 +29,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - Security ]; doCheck = false; diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index 04be4a79ca19..8c8f6d425d72 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -1,9 +1,7 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-lBHqvwZrnkSfmMXBmnhovbDn+pf5iLJepJjO/FKT1wY="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; mainProgram = "dotenv-linter"; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 50c839d12ba1..d11ea977b5af 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, ocamlPackages, - CoreServices, }: stdenv.mkDerivation rec { @@ -37,26 +36,24 @@ stdenv.mkDerivation rec { ocamlbuild ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ] - ++ ( - with ocamlPackages; - [ - core_kernel - dtoa - fileutils - lwt_log - lwt_ppx - ocaml_lwt - ppx_deriving - ppx_gen_rec - ppx_let - sedlex - visitors - wtf8 - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify ] - ); + buildInputs = ( + with ocamlPackages; + [ + core_kernel + dtoa + fileutils + lwt_log + lwt_ppx + ocaml_lwt + ppx_deriving + ppx_gen_rec + ppx_let + sedlex + visitors + wtf8 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify ] + ); meta = with lib; { description = "Static type checker for JavaScript"; diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index c889f7994c59..affbe921db9f 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -4,7 +4,6 @@ rustPlatform, fetchCrate, git, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -16,8 +15,6 @@ rustPlatform.buildRustPackage rec { crateName = "fac"; hash = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI="; }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; useFetchCargoVendor = true; cargoHash = "sha256-+2j6xH1Ww1WOLfbjknUPvCmYLAl4W3Zp/mQTaL0qnv0="; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 746c35a1d53f..2b43cb5ea1a5 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - darwin, - stdenv, openssl, pkg-config, }: @@ -27,12 +25,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; }; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; # Some tests fail, because test using internet connection and install NodeJS by example diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 8131dc5eb8a9..f641be01c91f 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - CoreServices, nix-update-script, }: stdenv.mkDerivation rec { @@ -13,8 +12,6 @@ stdenv.mkDerivation rec { hash = "sha256-6SUFuDvJd2KG6ucZ1YvOp/8ld6/hLLXMsnnIHn28cC0="; }; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix index fae399658a30..3877c2d3a3f0 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -2,8 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - stdenv, - Security, nix-update-script, }: @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PF2TFfzWmHXLgTopzJ04dfnzd3Sc/A6Hduffz2guxmU="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-jymWM0DCR6jUE1Kyhbx6HHf6YlrGu1THKTyDHaPG+Vs="; diff --git a/pkgs/development/tools/cotton/default.nix b/pkgs/development/tools/cotton/default.nix index eb8d9277c807..87f20b1acff4 100644 --- a/pkgs/development/tools/cotton/default.nix +++ b/pkgs/development/tools/cotton/default.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-y162tjxPGZQiYBJxFk4QN9ZqSH8jrqa5Y961Sx2zrRs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - meta = with lib; { description = "Package manager for JavaScript projects"; mainProgram = "cotton"; diff --git a/pkgs/development/tools/database/replibyte/default.nix b/pkgs/development/tools/database/replibyte/default.nix index a71e14136239..02c7ce30822d 100644 --- a/pkgs/development/tools/database/replibyte/default.nix +++ b/pkgs/development/tools/database/replibyte/default.nix @@ -1,12 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -33,12 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "--all-features" ]; diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index ac8e2f1f705f..3a70f4be5c70 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, testers, - Security, surrealdb-migrations, nix-update-script, }: @@ -26,8 +24,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-l59RbKohfPsAp/70UaT/bhy5Z4orVf7fuJgU+0fuyk4="; - buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - # Error: No such file or directory (os error 2) # failures: # cli::apply::apply_initial_migrations diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index e7851d7d1e29..ed24ccc73933 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -2,7 +2,6 @@ lib, buildGoModule, copyDesktopItems, - darwin, desktopToDarwinBundle, fetchFromGitHub, fetchYarnDeps, @@ -156,11 +155,6 @@ rec { gtk3 libayatana-appindicator webkitgtk_4_0 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.WebKit ]; desktopItems = [ diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 194b614a12d5..395fb218f93c 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -7,7 +7,6 @@ flex, bison, qt5, - CoreServices, libiconv, spdlog, sqlite, @@ -51,8 +50,7 @@ stdenv.mkDerivation rec { qtbase wrapQtAppsHook ] - ) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + ); cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 88f1f2bcf251..ba113aed246e 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -6,10 +6,6 @@ pkg-config, openssl, - # darwin - Security, - SystemConfiguration, - # tests firefox-esr-unwrapped, firefox-unwrapped, @@ -37,14 +33,9 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + ]; checkFlags = [ # Disable tests that require network access diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 069e9ad24da8..216def2f4ff0 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, rustPlatform, stdenv, - Security, libiconv, }: @@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security ]; meta = with lib; { diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index 6053aaae41f7..9fc49832be9c 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -2,11 +2,9 @@ lib, fetchFromGitHub, rustPlatform, - stdenv, pkg-config, dbus, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -28,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl dbus - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; meta = with lib; { description = "Tool for working with a stack of patches"; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index dc2dc3f7c457..35d4a06a2d87 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -14,7 +14,6 @@ libGLU, ffmpeg, ncurses, - Cocoa, }: stdenv.mkDerivation rec { pname = "glslviewer"; @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { libGLU ncurses ffmpeg - ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ]; meta = with lib; { description = "Live GLSL coding renderer"; diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index a3f07bf00f50..56e8c8fb0491 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -5,8 +5,6 @@ rustPlatform, pkg-config, nix-update-script, - Security, - SystemConfiguration, openssl, }: @@ -32,12 +30,7 @@ rustPlatform.buildRustPackage { # 0.5.6 release has failing tests doCheck = false; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix index 0b6623ca1846..818e27aadeba 100644 --- a/pkgs/development/tools/graphql-client/default.nix +++ b/pkgs/development/tools/graphql-client/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, rustPlatform, fetchCrate, pkg-config, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -26,7 +24,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; meta = with lib; { description = "GraphQL tool for Rust projects"; diff --git a/pkgs/development/tools/hors/default.nix b/pkgs/development/tools/hors/default.nix index 09bf6b2ec98a..df6adfb63088 100644 --- a/pkgs/development/tools/hors/default.nix +++ b/pkgs/development/tools/hors/default.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-JTHgOEBpGXPO3C7YUbBF0LFeSUQK+R2w1LugwMV5xyU="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - # requires network access doCheck = false; diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 76f7bb443aa2..a4f68c8a285a 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-QUlR6PuOLbeAHzARtTo7Zn7fmjs2ET6TdXT4VgCYEVg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix index a3a26c4eae2c..8667d7762f6c 100644 --- a/pkgs/development/tools/jless/default.nix +++ b/pkgs/development/tools/jless/default.nix @@ -4,7 +4,6 @@ rustPlatform, stdenv, python3, - AppKit, libxcb, }: @@ -24,10 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; - buildInputs = - [ ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; meta = with lib; { description = "Command-line pager for JSON data"; diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index c01d074e7079..6648c35bf91d 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, @@ -8,7 +7,6 @@ python3, openssl, xorg, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -31,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xorg.xcbutil - ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; + ]; useFetchCargoVendor = true; cargoHash = "sha256-72DuM64wj8WW6soagodOFIeHvVn1CPpb1T3Y7GQYsbs="; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 0cc07789a927..db9baac735bb 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, installShellFiles, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,8 +21,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - postInstall = '' installShellCompletion completion/kubie.bash ''; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 6e297e0c075e..1ab12a5e082d 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -7,7 +7,6 @@ qtwebsockets, minizinc, makeWrapper, - Cocoa, }: let @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtwebsockets - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; sourceRoot = "${src.name}/MiniZincIDE"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index fa02f280b6a5..dd0fe97d9ff4 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -16,7 +16,6 @@ in perl, runCommand, zlib, - CoreServices, enableGold ? withGold stdenv.targetPlatform, enableGoldDefault ? false, @@ -122,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib gettext - ] ++ lib.optionals hostPlatform.isDarwin [ CoreServices ]; + ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix index 390c9661ef80..eb2e035423eb 100644 --- a/pkgs/development/tools/misc/dura/default.nix +++ b/pkgs/development/tools/misc/dura/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, - Security, zlib, }: @@ -29,14 +27,10 @@ rustPlatform.buildRustPackage rec { doCheck = false; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + openssl + zlib + ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index eb13e9d9b738..05d132e44ab6 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -8,7 +8,6 @@ libtool, makeWrapper, texinfo, - CoreServices, }: stdenv.mkDerivation rec { @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + ]; buildInputs = [ gettext libtool diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index d646d96ea9ef..e7ecfe24ba0c 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -4,8 +4,6 @@ buildGoModule, fetchFromGitHub, git, - Cocoa, - Virtualization, sigtool, testers, linuxkit, @@ -36,10 +34,6 @@ buildGoModule rec { # - sigtool is allows us to validly sign such executables with a dummy # authority. nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - Virtualization - ]; ldflags = [ "-s" diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 6ab724089453..9e7497fde4bf 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -4,7 +4,6 @@ fetchFromGitHub, libuuid, cacert, - Foundation, readline, }: @@ -22,7 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation readline ]; diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix index 7a645f4b8106..3a889cef0f54 100644 --- a/pkgs/development/tools/misc/pwninit/default.nix +++ b/pkgs/development/tools/misc/pwninit/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, @@ -8,7 +7,6 @@ makeBinaryWrapper, pkg-config, xz, - Security, }: rustPlatform.buildRustPackage rec { @@ -25,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xz - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; nativeBuildInputs = [ pkg-config makeBinaryWrapper diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 63d46fcc1a39..8925f8367fc6 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -6,8 +6,6 @@ help2man, installShellFiles, libiconv, - Security, - CoreServices, nix-update-script, }: @@ -34,8 +32,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security - CoreServices ]; # When we cross compile we cannot run the output executable to diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index a9026979efea..da22f57b399b 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, rustPlatform, libiconv, - Security, zlib, }: @@ -24,7 +23,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security ]; checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 6c15d463198d..80b5761528d2 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -4,7 +4,6 @@ fetchurl, ocaml, findlib, - darwin, ocaml-lsp, dune-release, }: @@ -27,10 +26,6 @@ else findlib ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - strictDeps = true; buildFlags = [ "release" ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 8871e9dea494..e6d761e19250 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -9,7 +9,6 @@ ncurses, curl, bubblewrap, - Foundation, }: assert lib.versionAtLeast ocaml.version "4.08.0"; @@ -31,13 +30,10 @@ stdenv.mkDerivation (finalAttrs: { ocaml curl ]; - buildInputs = - [ - ncurses - getconf - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + buildInputs = [ + ncurses + getconf + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ]; patches = [ ./opam-shebangs.patch ]; diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix index 9d85c9594ad8..bbced1b8b592 100644 --- a/pkgs/development/tools/pactorio/default.nix +++ b/pkgs/development/tools/pactorio/default.nix @@ -5,8 +5,6 @@ installShellFiles, pkg-config, bzip2, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -28,7 +26,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ bzip2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ bzip2 ]; postInstall = '' installManPage artifacts/pactorio.1 diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix index f020ab3c149c..c30d235c4f8e 100644 --- a/pkgs/development/tools/parsing/antlr/4.nix +++ b/pkgs/development/tools/parsing/antlr/4.nix @@ -108,7 +108,7 @@ let ninja pkg-config ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreFoundation ++ extraCppBuildInputs; + buildInputs = extraCppBuildInputs; cmakeDir = "../runtime/Cpp"; diff --git a/pkgs/development/tools/remodel/default.nix b/pkgs/development/tools/remodel/default.nix index 6d3f6a560271..89ac00bd0169 100644 --- a/pkgs/development/tools/remodel/default.nix +++ b/pkgs/development/tools/remodel/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Roblox file manipulation tool"; diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 720066ca6910..f5c3b50f308e 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -4,8 +4,6 @@ pkg-config, rustPlatform, openssl, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -22,15 +20,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-uR5XvkHUmZzCHZITKgScmzqjLOIvbPyrih/0B1OpsAc="; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 39fd3f726caf..026ef45b442b 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -6,7 +6,6 @@ cmake, llvmPackages, openssl, - apple_sdk, emacs, pkg-config, }: @@ -19,18 +18,12 @@ stdenv.mkDerivation rec { pkg-config llvmPackages.llvm.dev ]; - buildInputs = - [ - llvmPackages.llvm - llvmPackages.libclang - openssl - emacs - ] - ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple_sdk.libs.xpc - apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + llvmPackages.llvm + llvmPackages.libclang + openssl + emacs + ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]; src = fetchFromGitHub { owner = "andersbakken"; diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index ebb5769e8082..c26d213ac9a7 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -15,8 +15,6 @@ libxcrypt, libyaml, rust-jemalloc-sys-unprefixed, - Foundation, - Security, }: rustPlatform.buildRustPackage rec { @@ -50,8 +48,6 @@ rustPlatform.buildRustPackage rec { libiconv libobjc libunwind - Foundation - Security ]; preConfigure = '' diff --git a/pkgs/development/tools/rust/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index 8e478a869487..278182395abf 100644 --- a/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix @@ -5,9 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -26,15 +23,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + zlib + ]; buildFeatures = [ "fix" ]; diff --git a/pkgs/development/tools/rust/cargo-bazel/default.nix b/pkgs/development/tools/rust/cargo-bazel/default.nix index 1ee5aebc14b7..a92331c607d5 100644 --- a/pkgs/development/tools/rust/cargo-bazel/default.nix +++ b/pkgs/development/tools/rust/cargo-bazel/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchCrate, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-E/yF42Vx9tv8Ik1j23El3+fI19ZGzq6nikVMATY7m3E="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - # `test_data` is explicitly excluded from the package published to crates.io, so tests cannot be run doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index e8ab6ff42249..7cd88d36d85a 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -6,9 +6,7 @@ curl, openssl, stdenv, - CoreFoundation, libiconv, - Security, rav1e, }: @@ -36,9 +34,7 @@ rustPlatform.buildRustPackage rec { curl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation libiconv - Security ]; # Ensure that we are avoiding build of the curl vendored in curl-sys diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix index 73eae241f3fd..a67332aa956c 100644 --- a/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -5,10 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -27,16 +23,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + zlib + ]; # requires internet access doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 92f732f7d81d..ab6749d0a401 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,16 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; cargoBuildFlags = [ "-p=cargo-codspeed" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 714cabc62a9b..11b1a97c8724 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -5,9 +5,6 @@ rustPlatform, perl, pkg-config, - SystemConfiguration, - Security, - CoreFoundation, curl, libiconv, openssl, @@ -42,9 +39,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - SystemConfiguration - Security - CoreFoundation libiconv curl ]; diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index b6024347c03f..193a967a79f7 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -5,9 +5,6 @@ fetchFromGitHub, pkg-config, openssl, - Security, - SystemConfiguration, - CoreFoundation, curl, }: @@ -34,9 +31,6 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - CoreFoundation curl ]; diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index d2ee4011a5ee..6c86048160ca 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -5,8 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -25,14 +23,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + openssl + zlib + ]; doCheck = false; # integration tests depend on changing cargo config diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index 0a62e9a99992..8a37c1d524db 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -6,7 +6,6 @@ makeWrapper, perf, nix-update-script, - Security, }: rustPlatform.buildRustPackage rec { @@ -24,9 +23,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-uErlNPkacAmURNKAZp1wLsV2NB1w9HfjLZl5PgeMRu0="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/cargo-flamegraph \ diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 589186bd86e0..f76b85b33093 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pkg-config, rustPlatform, - Security, curl, openssl, libiconv, @@ -32,7 +31,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security libiconv curl ]; diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index 7569b4a10217..6f7960a834ae 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, libusb1, - stdenv, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -22,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + buildInputs = [ libusb1 ]; meta = with lib; { description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix index e132991be676..cbd1db25b326 100644 --- a/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -1,10 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - CoreGraphics, - Foundation, }: rustPlatform.buildRustPackage rec { @@ -21,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Kt4GLvbGK42RjivLpL5W5z5YBfDP5B83mCulWz6Bisw="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreGraphics - Foundation - ]; - meta = with lib; { description = "Cargo extension for building Android NDK projects"; mainProgram = "cargo-ndk"; diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix index b4c11bfdf927..304b901a18a9 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix @@ -33,7 +33,6 @@ pkg-config, rustPlatform, stdenv, - Security, writeShellScriptBin, }: @@ -124,7 +123,7 @@ lib.extendMkDerivation { cargoPgrxFlags' = lib.escapeShellArgs cargoPgrxFlags; in { - buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = (args.buildInputs or [ ]); nativeBuildInputs = (args.nativeBuildInputs or [ ]) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 9eedd3129e2e..a98e53c83c39 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -5,10 +5,7 @@ fetchFromGitHub, pkg-config, openssl, - CoreServices, - Security, libiconv, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -31,10 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security libiconv - SystemConfiguration ]; # Requires network access diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 8564f62150d7..b994a7a853c5 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -3,8 +3,6 @@ lib, rustPlatform, fetchFromGitHub, - Cocoa, - Foundation, }: rustPlatform.buildRustPackage rec { @@ -21,11 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-4AVZ747d6lOjxHN+co0A7APVB5Xj6g5p/Al5fLbgPnc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - Cocoa - ]; - NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" "AppKit" diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index 6014baaf3a90..e46acabfeb9b 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; meta = with lib; { description = "Simple cargo plugin to get a list of features for a specific crate"; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index fa4842c65a79..a69f3804ecb9 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -5,7 +5,6 @@ rustPlatform, cmake, python3Packages, - Security, # tests firefox-unwrapped, @@ -27,8 +26,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-k8n3adoqKp/RXkHybCKV2KlVnaoEhM6vF57BqeCDAP4="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - nativeCheckInputs = [ cmake python3Packages.cython diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index c78f0558b0a0..d3866bdfaac4 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -3,10 +3,8 @@ stdenv, fetchCrate, rustPlatform, - Security, openssl, pkg-config, - SystemConfiguration, libiconv, }: @@ -24,8 +22,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration libiconv ]; diff --git a/pkgs/development/tools/rust/humility/default.nix b/pkgs/development/tools/rust/humility/default.nix index 9e3520509071..b6eb5d2183a7 100644 --- a/pkgs/development/tools/rust/humility/default.nix +++ b/pkgs/development/tools/rust/humility/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, libusb1, libftdi, cargo-readme, pkg-config, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -18,14 +16,10 @@ rustPlatform.buildRustPackage rec { pkg-config cargo-readme ]; - buildInputs = - [ - libusb1 - libftdi - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - ]; + buildInputs = [ + libusb1 + libftdi + ]; src = fetchFromGitHub { owner = "oxidecomputer"; diff --git a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix index 63ddaae84bd9..aace64a71a35 100644 --- a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix +++ b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix @@ -9,7 +9,6 @@ pkg-config, openssl, xz, - Security, }: rustPlatform.buildRustPackage rec { @@ -47,14 +46,10 @@ rustPlatform.buildRustPackage rec { lib.optionals stdenv.hostPlatform.isLinux [ patchelfPatch ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - xz - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + openssl + xz + ]; # update Cargo.lock to work with openssl 3 postPatch = '' diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 649497629329..fedce3547d27 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -10,8 +10,6 @@ openssl, curl, zlib, - Security, - CoreServices, libiconv, xz, }: @@ -47,8 +45,6 @@ rustPlatform.buildRustPackage rec { zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security libiconv xz ]; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index f1f59c17f1f8..bb62459a145f 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -9,9 +9,6 @@ libiconv, testers, sqlx-cli, - CoreFoundation, - Security, - SystemConfiguration, nix-update-script, }: @@ -51,9 +48,6 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - SystemConfiguration libiconv ]; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 0b69da6c8de9..9f282aa3a3ce 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -6,9 +6,6 @@ openssl, pkg-config, stdenv, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; @@ -25,13 +22,7 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ installShellFiles pkg-config diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 9a8dc3ef60e7..f655d995f2cc 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -11,7 +11,6 @@ avrlibc, libGLU, libGL, - GLUT, }: let @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { libglut libGLU libGL - ] ++ lib.optional stdenv.hostPlatform.isDarwin GLUT; + ]; # remove forbidden references to $TMPDIR preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix index a186e600a686..5df228765c87 100644 --- a/pkgs/development/tools/spr/default.nix +++ b/pkgs/development/tools/spr/default.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - Security, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-4fYQM+GQ5yqES8HQ23ft4wfM5mwDdcWuE5Ed2LST9Gw="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - meta = with lib; { description = "Submit pull requests for individual, amendable, rebaseable commits to GitHub"; mainProgram = "spr"; diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 9b9709945b76..19ff19753ec3 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,8 +2,6 @@ rustPlatform, fetchFromGitHub, lib, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -17,8 +15,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DeViAqL+7mta/wH7rLyltOCtHCTFXZczn2vAL1k+R2Y="; }; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - useFetchCargoVendor = true; cargoHash = "sha256-LBJD1w8/jLw5xYdHxR+EM2Cb4eVFpRw+M/K7K4Z0OUw="; diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index d21ac338f34f..0ad52606ef9f 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -8,7 +8,6 @@ spdlog, libxml2, libffi, - Foundation, testers, }: @@ -28,17 +27,13 @@ stdenv.mkDerivation (finalAttrs: { llvmPackages.lld ]; - buildInputs = - [ - boost - spdlog - llvmPackages.llvm - libxml2 - libffi - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; + buildInputs = [ + boost + spdlog + llvmPackages.llvm + libxml2 + libffi + ]; cmakeFlags = [ diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix index b51d26745bf2..042832ea99ef 100644 --- a/pkgs/development/tools/wrangler_1/default.nix +++ b/pkgs/development/tools/wrangler_1/default.nix @@ -6,9 +6,6 @@ pkg-config, openssl, curl, - Security, - CoreServices, - CoreFoundation, libiconv, }: @@ -32,9 +29,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - CoreFoundation - CoreServices - Security libiconv ]; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index c0c6ee8e6ea0..3db1ed59db7a 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -28,7 +28,6 @@ nix, runtimeShell, gnupg, - darwin, installShellFiles, }: @@ -40,7 +39,6 @@ }@args: let - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; majorVersion = lib.versions.major version; minorVersion = lib.versions.minor version; @@ -215,20 +213,14 @@ let # NB: technically, we do not need bash in build inputs since all scripts are # wrappers over the corresponding JS scripts. There are some packages though # that use bash wrappers, e.g. polaris-web. - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - ApplicationServices - ] - ++ [ - zlib - libuv - openssl - http-parser - icu - bash - ] - ++ lib.optionals useSharedSQLite [ sqlite ]; + buildInputs = [ + zlib + libuv + openssl + http-parser + icu + bash + ] ++ lib.optionals useSharedSQLite [ sqlite ]; nativeBuildInputs = [ diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 76033e6fdec7..8e1d69a26acf 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -22,8 +22,6 @@ writeShellScriptBin, yarn, - AVKit, - CoreAudio, swift, mesa, @@ -153,64 +151,58 @@ python3.pkgs.buildPythonApplication { qt6.qtsvg ] ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; - propagatedBuildInputs = - with python3.pkgs; - [ - # This rather long list came from running: - # grep --no-filename -oE "^[^ =]*" python/{requirements.base.txt,requirements.bundle.txt,requirements.qt6_lin.txt} | \ - # sort | uniq | grep -v "^#$" - # in their repo at the git tag for this version - # There's probably a more elegant way, but the above extracted all the - # names, without version numbers, of their python dependencies. The hope is - # that nixpkgs versions are "close enough" - # I then removed the ones the check phase failed on (pythonCatchConflictsPhase) - attrs - beautifulsoup4 - blinker - build - certifi - charset-normalizer - click - colorama - decorator - flask - flask-cors - google-api-python-client - idna - importlib-metadata - itsdangerous - jinja2 - jsonschema - markdown - markupsafe - orjson - packaging - pip - pip-system-certs - pip-tools - protobuf - pyproject-hooks - pyqt6 - pyqt6-sip - pyqt6-webengine - pyrsistent - pysocks - requests - send2trash - setuptools - soupsieve - tomli - urllib3 - waitress - werkzeug - wheel - wrapt - zipp - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AVKit - CoreAudio - ]; + propagatedBuildInputs = with python3.pkgs; [ + # This rather long list came from running: + # grep --no-filename -oE "^[^ =]*" python/{requirements.base.txt,requirements.bundle.txt,requirements.qt6_lin.txt} | \ + # sort | uniq | grep -v "^#$" + # in their repo at the git tag for this version + # There's probably a more elegant way, but the above extracted all the + # names, without version numbers, of their python dependencies. The hope is + # that nixpkgs versions are "close enough" + # I then removed the ones the check phase failed on (pythonCatchConflictsPhase) + attrs + beautifulsoup4 + blinker + build + certifi + charset-normalizer + click + colorama + decorator + flask + flask-cors + google-api-python-client + idna + importlib-metadata + itsdangerous + jinja2 + jsonschema + markdown + markupsafe + orjson + packaging + pip + pip-system-certs + pip-tools + protobuf + pyproject-hooks + pyqt6 + pyqt6-sip + pyqt6-webengine + pyrsistent + pysocks + requests + send2trash + setuptools + soupsieve + tomli + urllib3 + waitress + werkzeug + wheel + wrapt + zipp + ]; nativeCheckInputs = with python3.pkgs; [ pytest diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index b38c6dffa88d..d12175c67f8a 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -8,16 +8,7 @@ openssl, withTTS ? false, speechd-minimal, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) - CoreAudio - AudioUnit - AVFoundation - AppKit - ; -in rustPlatform.buildRustPackage rec { pname = "blightmud"; version = "5.3.1"; @@ -42,15 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals (withTTS && stdenv.hostPlatform.isLinux) [ speechd-minimal ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals (withTTS && stdenv.hostPlatform.isDarwin) [ - AVFoundation - AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - AudioUnit - ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; checkFlags = let diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index 8d25bf7dc3d9..924b69f29f50 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -4,9 +4,6 @@ fetchFromGitHub, SDL2, libGL, - IOKit, - Foundation, - OpenGL, cmake, makeWrapper, }: @@ -32,16 +29,11 @@ stdenv.mkDerivation rec { sed -i '/plutil/d' CMakeLists.txt ''; - buildInputs = - [ - SDL2 - libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Foundation - OpenGL - ]; + buildInputs = [ + + SDL2 + libGL + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 81e8f826e509..10c67bb532a5 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -23,8 +23,6 @@ tileMode ? false, enableSound ? tileMode, buildPackages, - # MacOS / Darwin builds - darwin, }: stdenv.mkDerivation rec { @@ -71,19 +69,7 @@ stdenv.mkDerivation rec { libGLU libGL ] - ++ lib.optional enableSound SDL2_mixer - ++ (lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - AudioUnit - CoreAudio - ForceFeedback - Carbon - IOKit - OpenGL - ] - )); + ++ lib.optional enableSound SDL2_mixer; preBuild = '' diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index be92949cb91a..888c91162592 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -33,9 +33,6 @@ libdecor, alsa-lib, asciidoctor, - Foundation, - AudioUnit, - AudioToolbox, }: stdenv.mkDerivation rec { @@ -98,11 +95,6 @@ stdenv.mkDerivation rec { libXxf86vm libdecor wildmidi # until packaged on Darwin - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - AudioUnit - AudioToolbox ]; cmakeFlags = [ diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index ed3f5118b4e2..10fba6cb9406 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -14,8 +14,6 @@ pkg-config, zlib, enableTools ? false, - # Darwin-specific - AudioUnit, }: stdenv.mkDerivation rec { @@ -44,17 +42,13 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - SDL2 - libogg - libvorbis - libX11 - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioUnit - ]; + buildInputs = [ + SDL2 + libogg + libvorbis + libX11 + zlib + ]; enableParallelBuilding = true; diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 4c835cab698a..88f212a9f744 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -1,10 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, - SystemConfiguration, installShellFiles, }: @@ -19,11 +16,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eeQjezB6pRdnPADLgDLo8b+bUSP12gfBhFNt/uYCwHU="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - useFetchCargoVendor = true; cargoHash = "sha256-3YKFKngyLg2ah4GY+LlbPbnVks7/xFawnMf3D1gjmwI="; diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 8dd6c435c1b5..917c09389fd5 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -3,14 +3,13 @@ buildEnv, callPackage, makeWrapper, - Cocoa, }: buildEnv { name = "flare-1.14"; paths = [ - (callPackage ./engine.nix { inherit Cocoa; }) + (callPackage ./engine.nix { }) (callPackage ./game.nix { }) ]; diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 8d4069874bd6..41feaac20101 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -7,7 +7,6 @@ SDL2_image, SDL2_mixer, SDL2_ttf, - Cocoa, }: stdenv.mkDerivation rec { @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ]; meta = with lib; { description = "Free/Libre Action Roleplaying Engine"; diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 5367f2b6e868..76f3e95b9508 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -22,7 +22,6 @@ qtmultimedia, discord-rpc, yajl, - AppKit, }: let @@ -86,25 +85,21 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = - [ - boost - hunspell - libGLU - libsForQt5.qtkeychain - libsecret - libzip - luaEnv - pcre - pugixml - qtbase - qtmultimedia - yajl - discord-rpc - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - AppKit - ]; + buildInputs = [ + boost + hunspell + libGLU + libsForQt5.qtkeychain + libsecret + libzip + luaEnv + pcre + pugixml + qtbase + qtmultimedia + yajl + discord-rpc + ]; cmakeFlags = [ # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index c83c5648eb62..cff3576ebafe 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -7,9 +7,6 @@ pkg-config, wrapQtAppsHook, SDL2, - CoreMedia, - VideoToolbox, - VideoDecodeAcceleration, boost, bullet, # Please unpin this on the next OpenMW release. @@ -98,27 +95,21 @@ stdenv.mkDerivation rec { # If not set, OSG plugin .so files become shell scripts on Darwin. dontWrapQtApps = stdenv.hostPlatform.isDarwin; - buildInputs = - [ - SDL2 - boost - bullet' - ffmpeg_6 - libXt - luajit - lz4 - mygui - openal - osg' - recastnavigation - unshield - yaml-cpp - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreMedia - VideoDecodeAcceleration - VideoToolbox - ]; + buildInputs = [ + SDL2 + boost + bullet' + ffmpeg_6 + libXt + luajit + lz4 + mygui + openal + osg' + recastnavigation + unshield + yaml-cpp + ]; cmakeFlags = [ diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 8ad42af360bd..5988ca9d4300 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -19,7 +19,6 @@ openal, opusfile, libogg, - Cocoa, libXext, }: @@ -43,23 +42,19 @@ stdenv.mkDerivation rec { file ]; - buildInputs = - [ - freetype - SDL2 - SDL2_image - libGL - zlib - curl - glew - opusfile - openal - libogg - libXext - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + freetype + SDL2 + SDL2_image + libGL + zlib + curl + glew + opusfile + openal + libogg + libXext + ]; patches = [ # https://github.com/yvt/openspades/pull/793 fix Darwin build diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 08d3c3e40dbe..63cb3f5f18fd 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -11,8 +11,6 @@ curl, openalSupport ? true, openal, - Cocoa, - OpenAL, }: let @@ -53,17 +51,11 @@ let --replace "\"libopenal.so.1\"" "\"${openal}/lib/libopenal.so.1\"" ''; - buildInputs = - [ - SDL2 - libGL - curl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - OpenAL - ] - ++ lib.optional openalSupport openal; + buildInputs = [ + SDL2 + libGL + curl + ] ++ lib.optional openalSupport openal; makeFlags = [ "WITH_OPENAL=${mkFlag openalSupport}" diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 86de99a68a86..7f28c9d580d2 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -14,11 +14,6 @@ opusfile, libogg, libxmp, - Cocoa, - CoreAudio, - CoreFoundation, - IOKit, - OpenGL, copyDesktopItems, makeDesktopItem, pkg-config, @@ -51,29 +46,19 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - gzip - libGL - libGLU - libvorbis - libmad - flac - libopus - opusfile - libogg - libxmp - (if useSDL2 then SDL2 else SDL) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - CoreAudio - IOKit - OpenGL - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && useSDL2) [ - CoreFoundation - ]; + buildInputs = [ + gzip + libGL + libGLU + libvorbis + libmad + flac + libopus + opusfile + libogg + libxmp + (if useSDL2 then SDL2 else SDL) + ]; buildFlags = [ diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index fe583be48a4a..edecf97f68d6 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -19,11 +19,6 @@ libX11, SDL2, zlib, - Cocoa, - AudioToolbox, - Carbon, - CoreMIDI, - AudioUnit, cctools, nix-update-script, }: @@ -47,13 +42,6 @@ stdenv.mkDerivation rec { libGLU libGL ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - AudioToolbox - Carbon - CoreMIDI - AudioUnit - ] ++ [ curl freetype diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index d7a1294b3d51..e6bb798f9d7b 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -9,7 +9,6 @@ SDL2, glew, openal, - OpenAL, libvorbis, libogg, curl, @@ -23,9 +22,6 @@ angelscript, libopenglrecorder, sqlite, - Cocoa, - IOKit, - IOBluetooth, libsamplerate, shaderc, }: @@ -117,10 +113,6 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder ++ lib.optional stdenv.hostPlatform.isLinux openal ++ lib.optionals stdenv.hostPlatform.isDarwin [ - OpenAL - IOKit - Cocoa - IOBluetooth libsamplerate ]; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 047562bc028a..22e9476f1e6d 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -16,7 +16,6 @@ wavpack, icoutils, nixosTests, - Cocoa, buildClient ? true, }: @@ -79,9 +78,6 @@ stdenv.mkDerivation rec { zlib wavpack ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ] ++ lib.optionals buildClient ( [ SDL2 diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 74c2e5230d18..1e058c39481b 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -21,8 +21,6 @@ icu, lua, curl, - Cocoa, - Foundation, }: stdenv.mkDerivation rec { @@ -41,30 +39,25 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - SDL2 - SDL2_image - SDL2_mixer - SDL2_net - SDL2_ttf - pango - gettext - boost - libvorbis - fribidi - dbus - libpng - pcre - openssl - icu - lua - curl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - Foundation - ]; + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + SDL2_net + SDL2_ttf + pango + gettext + boost + libvorbis + fribidi + dbus + libpng + pcre + openssl + icu + lua + curl + ]; cmakeFlags = [ "-DENABLE_SYSTEM_LUA=ON" diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index e4d3b4c71dcd..3d6f31030b6f 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -78,14 +78,7 @@ stdenv.mkDerivation rec { dbus acl ] - ++ lib.optional enableSystemd systemd - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin; - [ - configd - apple_sdk.frameworks.ApplicationServices - ] - ); + ++ lib.optional enableSystemd systemd; propagatedBuildInputs = [ gmp ]; diff --git a/pkgs/misc/drivers/spacenavd/default.nix b/pkgs/misc/drivers/spacenavd/default.nix index f71387d26405..0914c8898cec 100644 --- a/pkgs/misc/drivers/spacenavd/default.nix +++ b/pkgs/misc/drivers/spacenavd/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, libXext, libX11, - IOKit, }: stdenv.mkDerivation (finalAttrs: { pname = "spacenavd"; @@ -20,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libX11 libXext - ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; + ]; configureFlags = [ "--disable-debug" ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index ec5886504edb..b56f309815a4 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -11,10 +11,7 @@ wafHook, # Darwin Dependencies aften, - AudioUnit, - CoreAudio, libobjc, - Accelerate, # BSD Dependencies freebsd, @@ -77,9 +74,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ aften - AudioUnit - CoreAudio - Accelerate libobjc ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ diff --git a/pkgs/os-specific/darwin/defaultbrowser/default.nix b/pkgs/os-specific/darwin/defaultbrowser/default.nix index f4f4c885d144..a08d7aa2516c 100644 --- a/pkgs/os-specific/darwin/defaultbrowser/default.nix +++ b/pkgs/os-specific/darwin/defaultbrowser/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - Foundation, }: stdenv.mkDerivation rec { @@ -21,8 +20,6 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; - buildInputs = [ Foundation ]; - meta = with lib; { mainProgram = "defaultbrowser"; description = "Command line tool for getting and setting a default browser (HTTP handler) in Mac OS X"; diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index 474d750ecc8c..bfdc1dfc7d3b 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -3,8 +3,6 @@ stdenv, fetchFromGitHub, fetchpatch, - Carbon, - Cocoa, }: stdenv.mkDerivation rec { @@ -26,11 +24,6 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ - Carbon - Cocoa - ]; - buildPhase = '' make install ''; diff --git a/pkgs/os-specific/darwin/macfuse/default.nix b/pkgs/os-specific/darwin/macfuse/default.nix index 7f7c0cb5183b..1461e3ef27f6 100644 --- a/pkgs/os-specific/darwin/macfuse/default.nix +++ b/pkgs/os-specific/darwin/macfuse/default.nix @@ -6,7 +6,6 @@ xar, undmg, libtapi, - DiskArbitration, }: stdenv.mkDerivation rec { @@ -24,7 +23,6 @@ stdenv.mkDerivation rec { undmg libtapi ]; - propagatedBuildInputs = [ DiskArbitration ]; postUnpack = '' xar -xf 'Install macFUSE.pkg' diff --git a/pkgs/os-specific/darwin/noah/default.nix b/pkgs/os-specific/darwin/noah/default.nix index 421b11df3232..fe149c20ac72 100644 --- a/pkgs/os-specific/darwin/noah/default.nix +++ b/pkgs/os-specific/darwin/noah/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - Hypervisor, }: stdenv.mkDerivation rec { @@ -18,7 +17,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ Hypervisor ]; meta = with lib; { description = "Bash on Ubuntu on macOS"; diff --git a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix index 03c56c0adf91..016cd81d6831 100644 --- a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix +++ b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - IOKit, }: stdenv.mkDerivation rec { @@ -17,8 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1nlibgr55bpln6jbdf8vqcp0fj9zv9343vflb7s9w0yh33fsbg9d"; }; - buildInputs = [ IOKit ]; - installPhase = '' mkdir -p $out/bin cp osx-cpu-temp $out/bin diff --git a/pkgs/os-specific/darwin/pngpaste/default.nix b/pkgs/os-specific/darwin/pngpaste/default.nix index 3df66b88534a..2360b9de8d26 100644 --- a/pkgs/os-specific/darwin/pngpaste/default.nix +++ b/pkgs/os-specific/darwin/pngpaste/default.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchFromGitHub, - AppKit, - Cocoa, }: let @@ -19,11 +17,6 @@ stdenv.mkDerivation { sha256 = "uvajxSelk1Wfd5is5kmT2fzDShlufBgC0PDCeabEOSE="; }; - buildInputs = [ - AppKit - Cocoa - ]; - installPhase = '' mkdir -p $out/bin cp pngpaste $out/bin diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix index 5b824da0f587..cf6702b92c53 100644 --- a/pkgs/os-specific/darwin/qes/default.nix +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - Carbon, }: stdenv.mkDerivation { @@ -16,8 +15,6 @@ stdenv.mkDerivation { sha256 = "1w9ppid7jg6f4q7pq40lhm0whg7xmnxcmf3pb9xqfkq2zj2f7dxv"; }; - buildInputs = [ Carbon ]; - makeFlags = [ "BUILD_PATH=$(out)/bin" ]; meta = with lib; { diff --git a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix index ed3512d7b5ad..c0299e390836 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix @@ -2,7 +2,6 @@ stdenv, fetchFromGitHub, cmake, - apple_sdk_sierra, xnu-new, }: @@ -16,7 +15,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; buildInputs = [ - apple_sdk_sierra.sdk xnu-new ]; } diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index d3bfcf6420d1..d988259daf8c 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -3,9 +3,6 @@ stdenv, fetchFromGitHub, perl, - AppKit, - Cocoa, - ScriptingBridge, }: stdenv.mkDerivation rec { @@ -21,9 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ perl - Cocoa - AppKit - ScriptingBridge ]; patches = [ ./trash.diff ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index b65285ef7133..3e97c23b1a2a 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,6 +1,7 @@ { lib, llvmPackages, + llvmPackages_16, fetchFromGitHub, fetchpatch, cmake, @@ -16,7 +17,6 @@ rustSupport ? true, - corrosion, rustc, cargo, rustPlatform, @@ -25,12 +25,7 @@ let inherit (llvmPackages) stdenv; mkDerivation = - ( - if stdenv.hostPlatform.isDarwin then - darwin.apple_sdk_11_0.llvmPackages_16.stdenv - else - llvmPackages.stdenv - ).mkDerivation; + (if stdenv.hostPlatform.isDarwin then llvmPackages_16.stdenv else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 4121a5e8b4d3..46977793f6fd 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -18,10 +18,6 @@ libsecret, xorg, ripgrep, - AppKit, - Cocoa, - CoreServices, - Security, cctools, xcbuild, quilt, @@ -149,10 +145,6 @@ stdenv.mkDerivation (finalAttrs: { libsecret ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - CoreServices - Security cctools xcbuild ]; diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index 913d77b029ec..cec812fe5ea9 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -3,7 +3,6 @@ rustPlatform, fetchCrate, stdenv, - Security, libiconv, nixosTests, }: @@ -22,7 +21,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-eYJoHFIC0NF3OAbZXDWB57IOFC9JDV4IXHQgzIWMT04="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security libiconv ]; diff --git a/pkgs/servers/fedigroups/default.nix b/pkgs/servers/fedigroups/default.nix index 83e53c195fcf..743b0c8a75ae 100644 --- a/pkgs/servers/fedigroups/default.nix +++ b/pkgs/servers/fedigroups/default.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitea, rustPlatform, pkg-config, git, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -42,7 +40,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; meta = with lib; { homepage = "https://git.ondrovo.com/MightyPork/group-actor#fedi-groups"; diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index 9d48f9c1136b..b111df18b60a 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -1,12 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -25,12 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; checkFlags = [ "--skip function_source_schemas" diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index 19ea2892e999..2cd92aa24622 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -5,7 +5,6 @@ openssl, pkg-config, stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -22,7 +21,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-PR8HoHroHp5nBbRwR8TZ5NeBH4eDXGV46HkDLeydmAk="; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; # Needed to get openssl-sys to use pkgconfig. diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index b77b1254c86c..cfef58e0b151 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -4,7 +4,6 @@ fetchFromGitHub, lib, libiconv, - Security, nixosTests, }: @@ -29,7 +28,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 158d0cc142e4..07102e05e42d 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -9,9 +9,6 @@ systemd, fmt, buildPackages, - # Darwin inputs - AudioToolbox, - AudioUnit, # Inputs curl, libcdio, @@ -209,21 +206,15 @@ let sha256 = "sha256-6wEFgiMsEoWvmfH609d+UZY7jzqDoNmXalpHBipqTN0="; }; - buildInputs = - [ - glib - fmt - # According to the configurePhase of meson, gtest is considered a - # runtime dependency. Quoting: - # - # Run-time dependency GTest found: YES 1.10.0 - gtest - ] - ++ concatAttrVals features_ featureDependencies - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - AudioUnit - ]; + buildInputs = [ + glib + fmt + # According to the configurePhase of meson, gtest is considered a + # runtime dependency. Quoting: + # + # Run-time dependency GTest found: YES 1.10.0 + gtest + ] ++ concatAttrVals features_ featureDependencies; nativeBuildInputs = [ meson diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 309030b4d303..7a3ebf54830a 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -18,9 +18,6 @@ libkrb5, xorg, ripgrep, - AppKit, - Cocoa, - Security, cctools, nixosTests, }: @@ -127,9 +124,6 @@ stdenv.mkDerivation (finalAttrs: { libkrb5 ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - Security cctools ]; diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index 4c53bbc5200f..7aaa0f023f6d 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -1,11 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, installShellFiles, - IOKit, - Security, }: rustPlatform.buildRustPackage rec { @@ -27,10 +24,6 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Security - ]; buildAndTestSubdir = "cli"; buildNoDefaultFeatures = true; diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index 2798e203542e..cbdc1e60553a 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -2,9 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - CoreServices, - Security, }: rustPlatform.buildRustPackage rec { @@ -21,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-m6bYkewBE0ZloDVUhUslS+dgPyoK+eay7rrP3+c00mo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; - meta = with lib; { description = "Infinitely transfer between every device over pure HTTP with pipes or browsers"; homepage = "https://github.com/nwtgck/piping-server-rust"; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index cb9dc6e2ce8c..067fb069e436 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, beamPackages, fetchFromGitHub, fetchFromGitLab, @@ -12,7 +11,6 @@ vips, pkg-config, glib, - darwin, fetchpatch, ... }: @@ -126,16 +124,10 @@ beamPackages.mixRelease rec { vix = prev.vix.override { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - vips - glib.dev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Kerberos - ]; + buildInputs = [ + vips + glib.dev + ]; VIX_COMPILATION_MODE = "PLATFORM_PROVIDED_LIBVIPS"; }; diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix index 0d958d6e5a28..b175fe411d87 100644 --- a/pkgs/servers/polaris/default.nix +++ b/pkgs/servers/polaris/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, nix-update-script, polaris-web, - darwin, nixosTests, }: @@ -34,10 +32,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-bVXz/rSfkmdQlAa3B4zamZebpRBOkch6zNOFiyEQBbY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Security - ]; - # Compile-time environment variables for where to find assets needed at runtime env = { POLARIS_WEB_DIR = "${polaris-web}/share/polaris-web"; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 4ca3038d410d..cdf726415a89 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -61,10 +61,6 @@ # Whether to build only the library. libOnly ? false, - AudioUnit, - Cocoa, - CoreServices, - CoreAudio, }: stdenv.mkDerivation rec { @@ -134,12 +130,6 @@ stdenv.mkDerivation rec { glib dbus ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioUnit - Cocoa - CoreServices - CoreAudio - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [ libintl ] diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix index 4774ebd1ce2d..174db43fa5d9 100644 --- a/pkgs/servers/rtrtr/default.nix +++ b/pkgs/servers/rtrtr/default.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-RPCT2mmzuvDYSTTDM7S1yRcmCe8RlkA1i80dW7OPVO4="; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; buildNoDefaultFeatures = true; diff --git a/pkgs/servers/search/lnx/default.nix b/pkgs/servers/search/lnx/default.nix index 56331187ff44..08a75bcd4f6a 100644 --- a/pkgs/servers/search/lnx/default.nix +++ b/pkgs/servers/search/lnx/default.nix @@ -1,10 +1,7 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, - DiskArbitration, - Foundation, }: # unstable was chosen because of an added Cargo.lock @@ -24,11 +21,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-9fro1Dx7P+P9NTsg0gtMfr0s4TEpkZA31EFAnObiNFo="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - DiskArbitration - Foundation - ]; meta = with lib; { description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants."; mainProgram = "lnx"; diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index 7c8dd710dce4..fb4ee5fcf4ce 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -3,13 +3,10 @@ rustPlatform, fetchFromGitHub, protobuf, - stdenv, pkg-config, openssl, rust-jemalloc-sys, nix-update-script, - Security, - SystemConfiguration, rust-jemalloc-sys-unprefixed, }: @@ -34,16 +31,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - rust-jemalloc-sys - rust-jemalloc-sys-unprefixed - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + rust-jemalloc-sys + rust-jemalloc-sys-unprefixed + ]; # Needed to get openssl-sys to use pkg-config. env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix index f056a726d476..9cc4559eed74 100644 --- a/pkgs/servers/search/quickwit/default.nix +++ b/pkgs/servers/search/quickwit/default.nix @@ -7,7 +7,6 @@ nix-update-script, protobuf, rust-jemalloc-sys, - Security, nodejs, yarn, fetchYarnDeps, @@ -84,7 +83,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index bbbccaea5fc2..3cfa51885b9b 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -22,7 +22,6 @@ libtiff, libxcrypt, callPackage, - SystemConfiguration, modules ? null, nixosTests, }: @@ -140,25 +139,22 @@ stdenv.mkDerivation rec { which yasm ]; - buildInputs = - [ - openssl - ncurses - gnutls - readline - libjpeg - sqlite - pcre - speex - ldns - libedit - libsndfile - libtiff - libuuid - libxcrypt - ] - ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ]; + buildInputs = [ + openssl + ncurses + gnutls + readline + libjpeg + sqlite + pcre + speex + ldns + libedit + libsndfile + libtiff + libuuid + libxcrypt + ] ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules); enableParallelBuilding = true; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 232b10706468..83c94e96a82c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -27,7 +27,6 @@ let libaio, liburing, systemd, - CoreServices, cctools, perl, jemalloc, @@ -110,7 +109,6 @@ let ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ]) ) ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices cctools perl libedit @@ -367,24 +365,20 @@ self: { # Supported until 2025-06-24 version = "10.5.28"; hash = "sha256-C1BwII2gEWZA8gvQhfETZSf5mMwjJocVvL81Lnt/PME="; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 version = "10.6.21"; hash = "sha256-jX+XFps7ogRIWJZbjPwlQ2RADfQ+kFBC+S4kuPp7DZY="; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 version = "10.11.11"; hash = "sha256-bynU1+QPxJr0oP5giYRQnvLRU9882K/kNZ3OPKDieJA="; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_114 = self.callPackage generic { # Supported until 2029-05-29 version = "11.4.5"; hash = "sha256-/2WV+MSC+ZIeObl/oRIjd6afDcvZJVPGuQMsvw6bU1Q="; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; } diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 735cbdbf4e90..fe1a1488ac0a 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -21,7 +21,6 @@ libfido2, numactl, cctools, - CoreServices, developer_cmds, libtirpc, rpcsvc-proto, @@ -86,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: { libtirpc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices developer_cmds ]; diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index d64e5c445b03..cb5a3d1ce511 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -22,7 +22,6 @@ libfido2, numactl, cctools, - CoreServices, developer_cmds, libtirpc, rpcsvc-proto, @@ -103,7 +102,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools - CoreServices developer_cmds DarwinTools ]; diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index 3b53fc525f28..317627b5f782 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -22,7 +22,6 @@ libfido2, numactl, cctools, - CoreServices, developer_cmds, libtirpc, rpcsvc-proto, @@ -112,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools - CoreServices developer_cmds DarwinTools ] diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix index aaac48de68ff..50255a8f5397 100644 --- a/pkgs/servers/sql/percona-server/default.nix +++ b/pkgs/servers/sql/percona-server/default.nix @@ -2,7 +2,6 @@ pkgs: { # old lts percona-server_8_0 = pkgs.callPackage ./8_0.nix { inherit (pkgs.darwin) developer_cmds DarwinTools; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; boost = pkgs.boost177; # Configure checks for specific version. icu = pkgs.icu69; # newer versions cause linking failures against `libabsl_spinlock_wait` @@ -10,7 +9,6 @@ pkgs: { }; percona-server_8_4 = pkgs.callPackage ./8_4.nix { inherit (pkgs.darwin) developer_cmds DarwinTools; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; # newer versions cause linking failures against `libabsl_spinlock_wait` protobuf = pkgs.protobuf_21; }; diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 0663d08b2424..dc93203ce3ac 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -5,8 +5,6 @@ fetchFromGitHub, fetchpatch, makeWrapper, - CoreFoundation, - AppKit, binaryen, cargo, libfido2, @@ -15,7 +13,6 @@ pkg-config, pnpm_10, rustc, - Security, stdenv, xdg-utils, wasm-bindgen-cli, @@ -50,12 +47,7 @@ let buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; # https://github.com/NixOS/nixpkgs/issues/161570 , @@ -144,16 +136,10 @@ buildGoModule rec { "webassets_embed" ] ++ lib.optional withRdpClient "desktop_access_rdp"; - buildInputs = - [ - openssl - libfido2 - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && withRdpClient) [ - CoreFoundation - Security - AppKit - ]; + buildInputs = [ + openssl + libfido2 + ]; nativeBuildInputs = [ makeWrapper pkg-config diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 7b4ea22faa13..b30297ff87c2 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -6,7 +6,6 @@ fetchpatch, trezor-udev-rules, nixosTests, - AppKit, }: buildGoModule rec { @@ -37,9 +36,7 @@ buildGoModule rec { }) ]; - propagatedBuildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ]; ldflags = [ "-s" diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 0e01767fa2ba..7211058f3146 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -1,10 +1,7 @@ { lib, - stdenv, fetchFromGitHub, buildGoModule, - Cocoa, - WebKit, }: buildGoModule rec { @@ -20,11 +17,6 @@ buildGoModule rec { vendorHash = "sha256-wWIw0gNn5tqRq0udzPy/n2OkiIVESpSotOSn2YlBNS4="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - WebKit - ]; - ldflags = [ "-s" "-w" diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 2c0d7c0cf57f..c868e7463e5c 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -6,8 +6,6 @@ openssl, libpq, libiconv, - Security, - SystemConfiguration, protobuf, rustfmt, nixosTests, @@ -39,8 +37,6 @@ rustPlatform.buildRustPackage rec { [ libpq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security - SystemConfiguration ]; # Using OPENSSL_NO_VENDOR is not an option on darwin diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index b6a1c1f525be..646c122b55d1 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -5,9 +5,6 @@ xorg, pixman, pkg-config, - AppKit, - Foundation, - Xplugin, }: let @@ -33,9 +30,6 @@ stdenv.mkDerivation { xorg.libXrandr xorg.libXext pixman - AppKit - Xplugin - Foundation ]; meta = with lib; { license = licenses.apple-psl20; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index b4a39b23c1ff..a4558adff0b5 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -9,9 +9,6 @@ pkg-config, python3, xorg, - Libsystem, - AppKit, - Security, nghttp2, libgit2, withDefaultFeatures ? true, @@ -51,12 +48,9 @@ rustPlatform.buildRustPackage { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib - Libsystem - Security ] ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ xorg.libX11 ] ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isDarwin) [ - AppKit nghttp2 libgit2 ]; diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index 25900d9aa960..cdd2f9e367cb 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/pkgs/shells/nushell/plugins/default.nix @@ -3,28 +3,24 @@ config, newScope, dbus, - IOKit, - CoreFoundation, - Foundation, - Security, }: lib.makeScope newScope ( self: with self; { - gstat = callPackage ./gstat.nix { inherit Security; }; - formats = callPackage ./formats.nix { inherit IOKit Foundation; }; - polars = callPackage ./polars.nix { inherit IOKit Foundation; }; - query = callPackage ./query.nix { inherit IOKit CoreFoundation; }; - net = callPackage ./net.nix { inherit IOKit CoreFoundation; }; - units = callPackage ./units.nix { inherit IOKit Foundation; }; - highlight = callPackage ./highlight.nix { inherit IOKit Foundation; }; + gstat = callPackage ./gstat.nix { }; + formats = callPackage ./formats.nix { }; + polars = callPackage ./polars.nix { }; + query = callPackage ./query.nix { }; + net = callPackage ./net.nix { }; + units = callPackage ./units.nix { }; + highlight = callPackage ./highlight.nix { }; dbus = callPackage ./dbus.nix { inherit dbus; nushell_plugin_dbus = self.dbus; }; - skim = callPackage ./skim.nix { inherit IOKit CoreFoundation; }; + skim = callPackage ./skim.nix { }; } // lib.optionalAttrs config.allowAliases { regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release."; diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 7581ed0cf2f0..f57a42812fde 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -4,8 +4,6 @@ rustPlatform, nushell, pkg-config, - IOKit, - Foundation, nix-update-script, }: @@ -16,10 +14,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Foundation - ]; cargoBuildFlags = [ "--package nu_plugin_formats" ]; checkPhase = '' diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 458f57e1beb8..83b0b131df6d 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -5,7 +5,6 @@ openssl, nushell, pkg-config, - Security, nix-update-script, }: @@ -16,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; checkPhase = '' diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index d78b8007bd82..6cfb7e493285 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -5,8 +5,6 @@ pkg-config, nix-update-script, fetchFromGitHub, - IOKit, - Foundation, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-y0SCpDU1GM5JrixOffP1DRGtaXZsBjr7fYgYxhn4NDg="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Foundation - ]; cargoBuildFlags = [ "--package nu_plugin_highlight" ]; checkPhase = '' diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 26253b679db7..08b8e1b4d80e 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -2,9 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - IOKit, - CoreFoundation, nix-update-script, }: @@ -24,11 +21,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - IOKit - ]; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index 31e8ec22b9b1..8138bb9ef3de 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -5,8 +5,6 @@ openssl, nushell, pkg-config, - IOKit, - Foundation, nix-update-script, }: @@ -18,12 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Foundation - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "--package nu_plugin_polars" ]; checkPhase = '' diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 880bbca3a64b..0d0ee4915a1f 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -3,8 +3,6 @@ lib, rustPlatform, nushell, - IOKit, - CoreFoundation, nix-update-script, pkg-config, openssl, @@ -18,15 +16,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = - [ - openssl - curl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - CoreFoundation - ]; + buildInputs = [ + openssl + curl + ]; cargoBuildFlags = [ "--package nu_plugin_query" ]; checkPhase = '' diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix index 4f99cce8e1ac..86ccd54c3e59 100644 --- a/pkgs/shells/nushell/plugins/skim.nix +++ b/pkgs/shells/nushell/plugins/skim.nix @@ -5,8 +5,6 @@ rustPlatform, nix-update-script, fetchFromGitHub, - IOKit, - CoreFoundation, nushell, skim, }: @@ -26,10 +24,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-CvBBBDi8AkSfCIcUyUH4e5DX5tija1KqE9z05lndNE4="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - CoreFoundation - ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix index f6aa34a02730..179242bf2a1d 100644 --- a/pkgs/shells/nushell/plugins/units.nix +++ b/pkgs/shells/nushell/plugins/units.nix @@ -5,8 +5,6 @@ pkg-config, nix-update-script, fetchFromGitHub, - IOKit, - Foundation, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-3v9jP8nL0JqtC76igsCytkQAVTgWqzHH0KQX3o6bi0c="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Foundation - ]; cargoBuildFlags = [ "--package nu_plugin_units" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index ef10ceed7f74..9dfe095de200 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -8,7 +8,6 @@ libpulseaudio, pkg-config, patchelf, - Security, }: rustPlatform.buildRustPackage rec { @@ -32,7 +31,7 @@ rustPlatform.buildRustPackage rec { xorg.libX11 xorg.libXScrnSaver libpulseaudio - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; nativeBuildInputs = [ pkg-config patchelf diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 37d84e65cef1..71136f1d5cff 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -5,9 +5,7 @@ fetchFromGitHub, rustPlatform, installShellFiles, - Security, libiconv, - Libsystem, }: rustPlatform.buildRustPackage rec { @@ -36,9 +34,7 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security libiconv - Libsystem ]; meta = with lib; { diff --git a/pkgs/tools/admin/trinsic-cli/default.nix b/pkgs/tools/admin/trinsic-cli/default.nix index 06926669fc75..0ac76ace16bf 100644 --- a/pkgs/tools/admin/trinsic-cli/default.nix +++ b/pkgs/tools/admin/trinsic-cli/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchurl, - Security, }: rustPlatform.buildRustPackage rec { @@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec { cargoVendorDir = "vendor"; doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - meta = with lib; { description = "Trinsic CLI"; longDescription = '' diff --git a/pkgs/tools/archivers/pax/default.nix b/pkgs/tools/archivers/pax/default.nix index 6426f1b36517..9dbf30620d73 100644 --- a/pkgs/tools/archivers/pax/default.nix +++ b/pkgs/tools/archivers/pax/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - utmp, musl-fts, }: @@ -15,9 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-6VXV06+Xrt4KP0Y6mlm4Po0Qg6rxQutvOIxUmn0YLms="; }; - buildInputs = - lib.optional stdenv.hostPlatform.isDarwin utmp - ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; + buildInputs = lib.optional stdenv.hostPlatform.isMusl musl-fts; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index f84a2ba8406e..640849617f89 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -10,8 +10,6 @@ openssl, wavpack, xcbuildHook, - Foundation, - AppKit, }: stdenv.mkDerivation rec { @@ -61,19 +59,13 @@ stdenv.mkDerivation rec { '' ); - buildInputs = - [ - bzip2 - icu - openssl - wavpack - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ gnustep-base ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - AppKit - ]; + buildInputs = [ + bzip2 + icu + openssl + wavpack + zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gnustep-base ]; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 4e7381a8f407..a689696c3b6a 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -9,7 +9,6 @@ pkg-config, fetchFromGitHub, python3, - Accelerate, _experimental-update-script-combinators, common-updater-scripts, ripgrep, @@ -37,14 +36,10 @@ stdenv.mkDerivation (finalAttrs: { "-DFETCHCONTENT_SOURCE_DIR_OPENFST:PATH=${finalAttrs.passthru.sources.openfst}" ]; - buildInputs = - [ - openblas - icu - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - ]; + buildInputs = [ + openblas + icu + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 3146aac36700..b76e7569aece 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -10,9 +10,6 @@ openssl, readline, gettext, - CoreFoundation, - IOKit, - Kerberos, }: stdenv.mkDerivation rec { @@ -41,9 +38,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext # bacula requires CoreFoundation, but its `configure` script will only link it when it detects libintl. - CoreFoundation - IOKit - Kerberos ] # acl relies on attr, which I can't get to build on darwin ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl; diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 48e82ee8d244..3c31e3e19999 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -18,7 +18,6 @@ xz, zlib, zstd, - CoreFoundation, }: stdenv.mkDerivation rec { @@ -56,9 +55,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ attr e2fsprogs - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation ]; configureFlags = [ diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index eb081f742075..55a1ba7015d2 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -6,8 +6,6 @@ pkg-config, openssl, libiconv, - Security, - SystemConfiguration, nix-update-script, }: @@ -32,8 +30,6 @@ rustPlatform.buildRustPackage rec { lib.optionals stdenv.hostPlatform.isLinux [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security - SystemConfiguration ]; checkFlags = [ "--skip=tests::cli" ]; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 3b49848beffd..cc874b51493a 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium, xz, - Security, }: rustPlatform.buildRustPackage rec { @@ -32,7 +30,7 @@ rustPlatform.buildRustPackage rec { openssl libsodium xz - ] ++ (lib.optional stdenv.hostPlatform.isDarwin Security); + ]; meta = with lib; { description = "Data deduplication with compression and public key encryption"; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 5f9c0ca5073e..20a60e9d2db5 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -8,8 +8,6 @@ libvorbis, libmad, libao, - CoreServices, - IOKit, }: stdenv.mkDerivation (finalAttrs: { @@ -31,17 +29,12 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - libiconv - libvorbis - libmad - libao - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - IOKit - ]; + buildInputs = [ + libiconv + libvorbis + libmad + libao + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index d9b86e6081d4..6ac321e61fc6 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -5,8 +5,6 @@ m4, acl, libcap, - Carbon, - IOKit, }: stdenv.mkDerivation rec { @@ -19,17 +17,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - Carbon - IOKit - ] - else - [ - acl - libcap - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + acl + libcap + ]; env.CFLAGS = toString [ "-Wno-error=implicit-int" diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix index 8cf82b0db8f1..30ae24b57afc 100644 --- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -82,7 +82,6 @@ buildPythonPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security libiconv ] ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index ff1347c6c7e1..0c02ede8667f 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -9,7 +9,6 @@ libuuid, kmod, macfuse-stubs, - DiskArbitration, crypto ? false, libgcrypt, gnutls, @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ macfuse-stubs - DiskArbitration ]; # Note: libgcrypt is listed here non-optionally because its m4 macros are diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 95ee6d5f141f..137ada74b3d3 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -32,7 +32,6 @@ curl, texinfo, texliveSmall, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -126,15 +125,7 @@ stdenv.mkDerivation (finalAttrs: { libGLU libGL libglvnd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - OpenGL - GLUT - Cocoa - ] - ); + ]; dontWrapQtApps = true; diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index 395089f14ee6..4736c2b0418c 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -6,7 +6,6 @@ pkg-config, libdmtx, imagemagick, - Foundation, }: stdenv.mkDerivation rec { @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdmtx imagemagick - ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; + ]; meta = { description = "Data matrix command-line utilities"; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 149a0d04bd98..dd2dcaf6825f 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -24,7 +24,6 @@ aquaterm ? false, withWxGTK ? false, wxGTK32, - Cocoa, fontconfig ? null, gnused ? null, coreutils ? null, @@ -76,8 +75,7 @@ in qtbase qtsvg ] - ++ lib.optional withWxGTK wxGTK32 - ++ lib.optional (withWxGTK && stdenv.hostPlatform.isDarwin) Cocoa; + ++ lib.optional withWxGTK wxGTK32; postPatch = '' # lrelease is in qttools, not in qtbase. diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index bcd13cfff089..b73f00771c51 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -18,8 +18,6 @@ bash, bison, xorg, - ApplicationServices, - Foundation, python3, withXorg ? true, @@ -52,22 +50,16 @@ stdenv.mkDerivation rec { flex ]; - buildInputs = - [ - libpng - libjpeg - expat - fontconfig - gd - gts - pango - bash - ] - ++ optionals withXorg (with xorg; [ libXrender ]) - ++ optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + buildInputs = [ + libpng + libjpeg + expat + fontconfig + gd + gts + pango + bash + ] ++ optionals withXorg (with xorg; [ libXrender ]); hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index cca813af3c22..43b9bdb9f8e7 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -5,7 +5,6 @@ fetchurl, cmake, pkg-config, - darwin, openexr, zlib, imagemagick6, @@ -68,19 +67,11 @@ mkDerivation rec { qtbase netpbm ] - ++ ( - if stdenv.hostPlatform.isDarwin then - (with darwin.apple_sdk.frameworks; [ - OpenGL - GLUT - ]) - else - [ - libGLU - libGL - libglut - ] - ) + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGLU + libGL + libglut + ] ++ lib.optional enableUnfree (opencv.override { enableUnfree = true; }); patches = [ diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 47062e768673..fdb590743974 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -20,8 +20,6 @@ wayland-protocols, wayland-scanner, moltenvk, - AppKit, - Cocoa, }: stdenv.mkDerivation rec { @@ -64,8 +62,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ moltenvk moltenvk.dev - AppKit - Cocoa ]; libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 1464e0b0beb2..51f5552c970b 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -7,7 +7,6 @@ stdenv, ocl-icd, opencl-headers, - OpenCL, config, cudaSupport ? config.cudaSupport, cudatoolkit ? null, @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { opencv4 ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional stdenv.hostPlatform.isDarwin OpenCL ++ lib.optionals stdenv.hostPlatform.isLinux [ ocl-icd opencl-headers diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index ce7968e11131..c899421687eb 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -25,7 +25,6 @@ enableDbus ? false, libintl, libiconv, - Foundation, bash, python3, argp-standalone, @@ -84,7 +83,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Foundation ] ++ lib.optionals enableDbus [ dbus diff --git a/pkgs/tools/misc/aoc-cli/default.nix b/pkgs/tools/misc/aoc-cli/default.nix index b0c7c615cfaf..f63e2586bc79 100644 --- a/pkgs/tools/misc/aoc-cli/default.nix +++ b/pkgs/tools/misc/aoc-cli/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -21,7 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; useFetchCargoVendor = true; cargoHash = "sha256-cm8yt7PRjar21EVFIjXYgDkO7+VpHGIB3tJ8hkK+Phw="; diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index de68610e76a0..e95face53a8d 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -1,12 +1,9 @@ { lib, - stdenv, fetchCrate, rustPlatform, openssl, pkg-config, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -29,14 +26,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Command-line tool for downloading APK files from various sources"; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 83535fb9d033..d99f0b3a8c05 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -3,8 +3,6 @@ stdenv, fetchFromGitHub, xcbuildHook, - Foundation, - AddressBook, }: stdenv.mkDerivation { @@ -24,10 +22,6 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ - Foundation - AddressBook - ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 9ff4b4d058fa..bf716c07a46e 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -1,16 +1,14 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, - CoreServices, }: rustPlatform.buildRustPackage rec { pname = "dijo"; version = "0.2.7"; - buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; + buildInputs = [ ncurses ]; src = fetchFromGitHub { owner = "NerdyPepper"; repo = "dijo"; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index 7404b142fc00..d83b2fa79fe2 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -17,8 +15,6 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-88+U5Y2CC0PhikRO3VqoUwZEYZjwln+61OPWbLLb8T0="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - useFetchCargoVendor = true; cargoHash = "sha256-keBnhE4ltOVMEuxPifiB2EAHk32u3PqaPGTeVexVXWM="; diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix index cfbc7b343d1b..ef7e7d881656 100644 --- a/pkgs/tools/misc/envchain/default.nix +++ b/pkgs/tools/misc/envchain/default.nix @@ -7,7 +7,6 @@ ncurses, pkg-config, readline, - Security, }: stdenv.mkDerivation rec { @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ libedit ncurses - Security ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 3d85c7bee433..adc90020619d 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, installShellFiles, }: @@ -21,9 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-aEjsBhm0iPysA1Wz1Ea7rtX0g/yH/rklUkYV/Elxcq8="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.AppKit - ]; nativeBuildInputs = [ installShellFiles ]; # device::test_physical_device_name test fails on Darwin diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix index 5eeac952d277..c68950e1848b 100644 --- a/pkgs/tools/misc/fclones/gui.nix +++ b/pkgs/tools/misc/fclones/gui.nix @@ -7,8 +7,6 @@ gdk-pixbuf, gtk4, libadwaita, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,15 +28,11 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook4 ]; - buildInputs = - [ - gdk-pixbuf - gtk4 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.IOKit - ]; + buildInputs = [ + gdk-pixbuf + gtk4 + libadwaita + ]; postInstall = '' substituteInPlace snap/gui/fclones-gui.desktop \ diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 5ec56de3c064..062fa92567a5 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -7,8 +7,6 @@ pkg-config, openssl, installShellFiles, - Security, - AppKit, x11Support ? stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isBSD, xclip ? null, @@ -70,14 +68,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - Security - AppKit - ] - else - [ openssl ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; preBuild = lib.optionalString (x11Support && usesX11) ( if preferXsel && xsel != null then diff --git a/pkgs/tools/misc/flowgger/default.nix b/pkgs/tools/misc/flowgger/default.nix index 21713f24ce79..bc98069621dd 100644 --- a/pkgs/tools/misc/flowgger/default.nix +++ b/pkgs/tools/misc/flowgger/default.nix @@ -1,12 +1,10 @@ { lib, rustPlatform, - stdenv, fetchCrate, pkg-config, openssl, capnproto, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -26,7 +24,7 @@ rustPlatform.buildRustPackage rec { capnproto ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; + buildInputs = [ openssl ]; checkFlags = [ # test failed diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index d51d09a469ca..e13ce1b4920f 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - CoreServices, }: stdenv.mkDerivation rec { @@ -18,8 +17,6 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /System/Library/Frameworks/CoreServices.framework/CoreServices "-framework CoreServices" ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - makeFlags = [ "DESTDIR=$(out)" ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/misc/freshfetch/default.nix b/pkgs/tools/misc/freshfetch/default.nix index eb7799428958..850dc742e840 100644 --- a/pkgs/tools/misc/freshfetch/default.nix +++ b/pkgs/tools/misc/freshfetch/default.nix @@ -2,12 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - AppKit, - CoreFoundation, - DiskArbitration, - Foundation, - IOKit, }: rustPlatform.buildRustPackage rec { @@ -27,14 +21,6 @@ rustPlatform.buildRustPackage rec { # freshfetch depends on rust nightly features RUSTC_BOOTSTRAP = 1; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreFoundation - DiskArbitration - Foundation - IOKit - ]; - meta = with lib; { description = "Fresh take on neofetch"; homepage = "https://github.com/k4rakara/freshfetch"; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 1b434c71aea8..08b2e2c6937a 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, autoreconfHook, - DiskArbitration, pkg-config, bzip2, libarchive, @@ -36,18 +35,14 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - bzip2 - libarchive - libconfuse - libsodium - xz - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - DiskArbitration - ]; + buildInputs = [ + bzip2 + libarchive + libconfuse + libsodium + xz + zlib + ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index b302e7c4fbe5..9cc22a265e50 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-OsK6X7qwMMQ1FK3JE98J2u6pn6AixE8izFmxUVDs5GM="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - doInstallCheck = true; installCheckPhase = '' $out/bin/grex --help > /dev/null diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 79859ce7f990..6b2f2b68e900 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -22,7 +20,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-eZpGqkowp/R//RqLRk3AIbTpW3i9e+lOWpfdli7S4uE="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' installManPage doc/hyperfine.1 diff --git a/pkgs/tools/misc/iay/default.nix b/pkgs/tools/misc/iay/default.nix index d30f38d3d4fc..ed75f91ce418 100644 --- a/pkgs/tools/misc/iay/default.nix +++ b/pkgs/tools/misc/iay/default.nix @@ -5,10 +5,6 @@ rustPlatform, openssl, pkg-config, - AppKit, - Cocoa, - Foundation, - Security, }: rustPlatform.buildRustPackage rec { @@ -27,16 +23,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - Foundation - Security - ]; + buildInputs = [ + openssl + ]; NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-framework" diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index 9979cd0dc2a9..775a22a16c3f 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -1,11 +1,9 @@ { - stdenv, fetchFromGitHub, lib, rustPlatform, pkg-config, dbus, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + buildInputs = [ dbus ]; meta = with lib; { description = "VR Lighthouse power state management"; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index a0febe773a63..340cb69988bc 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -1,14 +1,11 @@ { lib, - stdenv, pkgs, rustPackages, fetchFromGitHub, rustPlatform, writers, nixosTests, - CoreServices, - Security, }: let @@ -45,10 +42,6 @@ in RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { }; nativeBuildInputs = [ rustPackages.rustfmt ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; # copy the docs to the $man and $doc outputs postInstall = '' diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 54b4fd6f93d7..a4252e97065e 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -8,7 +8,6 @@ lrzsz, ncurses, libiconv, - IOKit, }: stdenv.mkDerivation rec { @@ -27,7 +26,6 @@ stdenv.mkDerivation rec { [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - IOKit ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 71fb707312c9..0c983c9a7450 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,9 +1,7 @@ { - stdenv, lib, buildGoModule, fetchFromGitHub, - Cocoa, installShellFiles, }: @@ -22,8 +20,6 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Cocoa; - ldflags = [ "-s" "-w" diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix index e3fbe0415d41..516ea40f1317 100644 --- a/pkgs/tools/misc/octofetch/default.nix +++ b/pkgs/tools/misc/octofetch/default.nix @@ -5,7 +5,6 @@ openssl, pkg-config, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -24,9 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; meta = with lib; { homepage = "https://github.com/azur1s/octofetch"; diff --git a/pkgs/tools/misc/owofetch/default.nix b/pkgs/tools/misc/owofetch/default.nix index f850a9ad6949..7647a0712e4d 100644 --- a/pkgs/tools/misc/owofetch/default.nix +++ b/pkgs/tools/misc/owofetch/default.nix @@ -3,8 +3,6 @@ stdenvNoCC, rustPlatform, fetchFromGitHub, - Foundation, - DiskArbitration, }: rustPlatform.buildRustPackage rec { @@ -22,11 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-0ON1h8+ruLOvBR7Q/hOIW6j+BjfPAAuYA2wrUYj59Ow="; - buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ - Foundation - DiskArbitration - ]; - meta = with lib; { description = "Alternative to *fetch, uwuifies all stats"; homepage = "https://github.com/netthier/owofetch-rs"; diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index 54ffb7caf835..e45e0f090f6c 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + openssl + ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 7d32d467bfc1..4fdead517c5f 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -5,7 +5,6 @@ autoreconfHook, ncurses, libxcrypt, - utmp, pam ? null, }: @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { ncurses libxcrypt pam - ] ++ lib.optional stdenv.hostPlatform.isDarwin utmp; + ]; # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index c4e787f1d503..b9cb01474888 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, installShellFiles, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,8 +21,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - postInstall = '' installManPage man/man1/shadowenv.1 installManPage man/man5/shadowlisp.5 diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix index fec1bdb3e5b0..fa13c5fcb0e7 100644 --- a/pkgs/tools/misc/sheldon/default.nix +++ b/pkgs/tools/misc/sheldon/default.nix @@ -6,7 +6,6 @@ pkg-config, openssl, installShellFiles, - Security, curl, }: @@ -27,7 +26,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security curl ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/sshx/default.nix b/pkgs/tools/misc/sshx/default.nix index 8529f3983ba5..1f3432979f5f 100644 --- a/pkgs/tools/misc/sshx/default.nix +++ b/pkgs/tools/misc/sshx/default.nix @@ -4,8 +4,6 @@ rustPlatform, fetchFromGitHub, protobuf, - darwin, - stdenv, buildNpmPackage, }: let @@ -33,8 +31,6 @@ let nativeBuildInputs = [ protobuf ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - cargoBuildFlags = [ "--package" pname diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix index 9dd4cb6ff039..b6f061f4647e 100644 --- a/pkgs/tools/misc/synth/default.nix +++ b/pkgs/tools/misc/synth/default.nix @@ -2,9 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - AppKit, - Security, }: rustPlatform.buildRustPackage rec { @@ -21,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-sJSU85f4bLh89qo8fojWJNfJ9t7i/Hlg5pnLcxcwKt4="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Security - ]; - checkFlags = [ # https://github.com/shuttle-hq/synth/issues/309 "--skip=docs_blog_2021_08_31_seeding_databases_tutorial_dot_md" diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index 7d5d1a906ff0..3469d56bc7e1 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - IOKit, }: rustPlatform.buildRustPackage rec { @@ -20,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-4bscAhYE3JNk4ikTH+Sw2kGDDsBWcCZZ88weg9USjC0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; - # many tests are failing doCheck = false; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index a6c2349bef13..e5428c9b328c 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -4,7 +4,6 @@ fetchurl, nixosTests, pkg-config, - CoreAudio, libobjc, libjack2, ncurses, @@ -47,7 +46,6 @@ stdenv.mkDerivation rec { alsa-lib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio libobjc ] ++ lib.optionals enableVorbis [ diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix index 37bfd5a8aa8e..d95e7d74c1f9 100644 --- a/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -5,7 +5,6 @@ rustPlatform, openssl, pkg-config, - Security, testers, tmux-sessionizer, installShellFiles, @@ -42,7 +41,7 @@ rustPlatform.buildRustPackage { pkg-config installShellFiles ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd tms \ diff --git a/pkgs/tools/misc/toastify/default.nix b/pkgs/tools/misc/toastify/default.nix index a95122afbeef..7271aa6834c9 100644 --- a/pkgs/tools/misc/toastify/default.nix +++ b/pkgs/tools/misc/toastify/default.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-xnmns0YXsKuoNxxax3St5pLiFwu6BD0iIYHNi9N9mO0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - ]; - preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index e445c7668a83..099046b2001f 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -3,9 +3,6 @@ lib, fetchFromGitHub, rustPlatform, - AppKit, - Cocoa, - Foundation, installShellFiles, }: @@ -27,12 +24,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - Foundation - ]; - env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ "-framework" diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 3d53fe0b43bb..3a2d425fe376 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, installShellFiles, stdenv, - Security, libiconv, protobuf, }: @@ -36,7 +35,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security libiconv ]; diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix index b711e6d8ca9a..c40d2add083c 100644 --- a/pkgs/tools/misc/wagyu/default.nix +++ b/pkgs/tools/misc/wagyu/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - Security, }: rustPlatform.buildRustPackage rec { @@ -22,8 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-vtNxRW/b8kvy21YQezCUiZNtLnlMSkdTRr/OkGy6UAw="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - meta = with lib; { description = "Rust library for generating cryptocurrency wallets"; homepage = "https://github.com/AleoHQ/wagyu"; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 581ac08c5bd6..dd36d8e84617 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -3,8 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - Cocoa, - AppKit, installShellFiles, }: @@ -24,11 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - AppKit - ]; - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; checkFlags = [ diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index c625d37362fc..ee98ae99d934 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -12,7 +12,6 @@ libssh2, cppunit, sphinx, - Security, nixosTests, }: @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { sqlite zlib libssh2 - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; outputs = [ "bin" diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix index bd7b819ecfea..e5d772e27798 100644 --- a/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/pkgs/tools/networking/bitmask-vpn/default.nix @@ -21,8 +21,6 @@ qtsvg, qttools, qtwayland, - CoreFoundation, - Security, provider ? "riseup", }: let @@ -121,17 +119,11 @@ buildGoModule rec { qtsvg ]; - buildInputs = - [ - qtbase - qtdeclarative - qtsvg - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; + buildInputs = [ + qtbase + qtdeclarative + qtsvg + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; # FIXME: building on Darwin currently fails # due to missing debug symbols for Qt, diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index fcca3ed8e954..0c1d01f877b7 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-uaSnH3pLpgASjauNWE94cpLxeAmVPqa/VUksR12hnGM="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - # tests do not find grcov path correctly meta = with lib; { description = "Rust tool to create TCP tunnels"; diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index fdc69871baf6..6b1c58f072a2 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -3,8 +3,6 @@ stdenv, rustPlatform, fetchFromBitbucket, - Libsystem, - SystemConfiguration, installShellFiles, }: @@ -40,11 +38,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ] ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Libsystem - SystemConfiguration - ]; - postInstall = '' installManPage $src/bore/doc/bore.1 ''; diff --git a/pkgs/tools/networking/cocom/default.nix b/pkgs/tools/networking/cocom/default.nix index 98f837cf0bba..0e3d79ec2d32 100644 --- a/pkgs/tools/networking/cocom/default.nix +++ b/pkgs/tools/networking/cocom/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-kfseD0dYNC1IFAamLJee7LozGppE2mZgBMCUHJC0dP4="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - # Tests require network access doCheck = false; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 4709b57656f1..dd29f9f561b0 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -12,7 +12,6 @@ curl, gsoap, rapidjson, - Security, enableTools ? true, # Use libcurl instead of libneon # Note that the libneon used is bundled in the project @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { openssl rapidjson ] - ++ lib.optional stdenv.hostPlatform.isDarwin Security ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid ++ lib.optional (enableThirdPartyCopy) gsoap; diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index d6075d7bb960..58775dde22a4 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -8,7 +8,6 @@ openssl, just, pandoc, - Security, }: rustPlatform.buildRustPackage { @@ -33,9 +32,7 @@ rustPlatform.buildRustPackage { just pandoc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; outputs = [ "out" diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index e02263f7a3f7..348780dab757 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, pkg-config, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -29,13 +28,9 @@ rustPlatform.buildRustPackage rec { OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; OPENSSL_DIR = "${lib.getDev openssl}"; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; meta = with lib; { description = "HTTP load testing application inspired by Ansible syntax"; diff --git a/pkgs/tools/networking/fast-ssh/default.nix b/pkgs/tools/networking/fast-ssh/default.nix index c8ce11fc984a..b3b64a6fea71 100644 --- a/pkgs/tools/networking/fast-ssh/default.nix +++ b/pkgs/tools/networking/fast-ssh/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-qkvonLuS18BBPdBUUnIAbmA+9ZJZFmTRaewrnK9PHFE="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - meta = with lib; { description = "TUI tool to use the SSH config for connections"; homepage = "https://github.com/julien-r44/fast-ssh"; diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix index 3504a56c920f..83f3a240e3f1 100644 --- a/pkgs/tools/networking/ifwifi/default.nix +++ b/pkgs/tools/networking/ifwifi/default.nix @@ -6,7 +6,6 @@ makeWrapper, networkmanager, iw, - Security, }: rustPlatform.buildRustPackage rec { @@ -24,7 +23,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-oxuOc9FSKYq6UjimZPLayJ+5xsWzh3gZV/mVpPbPWHk="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' wrapProgram "$out/bin/ifwifi" \ diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 19277c0d446b..52108501c237 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, sqlite, installShellFiles, - Security, libiconv, innernet, testers, @@ -35,7 +34,6 @@ rustPlatform.buildRustPackage rec { sqlite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security libiconv ]; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 017e6dd96ada..1a0864249264 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -10,7 +10,6 @@ zlib, perl538Packages, autoreconfHook, - Security, # Disabled by default as XOAUTH2 is an "OBSOLETE" SASL mechanism and this relies # on a package that isn't really maintained anymore: withCyrusSaslXoauth2 ? false, @@ -48,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { db cyrus_sasl zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; postInstall = lib.optionalString withCyrusSaslXoauth2 '' wrapProgram "$out/bin/mbsync" \ diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 042fd3c65234..ff6ea5e3d2a7 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -1,6 +1,5 @@ { stdenv, - Foundation, fetchurl, lib, libevent, @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { readline net-snmp openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 20fddf5ba910..081f399a73db 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -1,10 +1,7 @@ { rustPlatform, lib, - stdenv, fetchFromGitHub, - CoreServices, - Security, }: rustPlatform.buildRustPackage rec { @@ -18,11 +15,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2i8C1XgfI3MXnwXZzY6n8tIcw45G9h3vZqRlFaVoLH0="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-UEo/CSRg1hS/BIEQTEgqfwwz1LAMDdjKwV8bDyspX7o="; diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index 2b5e8e4e7988..70d4ffc4f253 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, rustPlatform, @@ -8,8 +7,6 @@ pkg-config, openssl, dbus, - AppKit, - Security, }: let @@ -32,15 +29,10 @@ rustPlatform.buildRustPackage { git pkg-config ]; - buildInputs = - [ - openssl - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Security - ]; + buildInputs = [ + openssl + dbus + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix index 1c432ee7493d..a6520b48d858 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/tools/networking/openconnect/common.nix @@ -17,7 +17,6 @@ zlib, pcsclite, vpnc-scripts, - PCSC, useDefaultExternalBrowser ? stdenv.hostPlatform.isLinux && stdenv.buildPlatform == stdenv.hostPlatform, # xdg-utils doesn't cross-compile xdg-utils, @@ -47,7 +46,6 @@ stdenv.mkDerivation { zlib (if useOpenSSL then openssl else gnutls) ] - ++ lib.optional stdenv.hostPlatform.isDarwin PCSC ++ lib.optionals stdenv.hostPlatform.isLinux [ p11-kit pcsclite diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 84d80d5eca41..d81fe2ef67b2 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,14 +1,9 @@ { callPackage, fetchurl, - darwin, }: let - common = - opts: - callPackage (import ./common.nix opts) { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; + common = opts: callPackage (import ./common.nix opts) { }; in rec { openconnect = common rec { diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix index 3a09bee66c52..fa40ad221611 100644 --- a/pkgs/tools/networking/s3rs/default.nix +++ b/pkgs/tools/networking/s3rs/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, rustPlatform, python3, perl, openssl, - Security, fetchFromGitHub, pkg-config, }: @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { perl pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; meta = with lib; { description = "S3 cli client with multi configs with diffent provider"; diff --git a/pkgs/tools/networking/suckit/default.nix b/pkgs/tools/networking/suckit/default.nix index 8cbbefeab601..af8db72d3c13 100644 --- a/pkgs/tools/networking/suckit/default.nix +++ b/pkgs/tools/networking/suckit/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; # requires internet access checkFlags = [ diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 0f612f17d386..00a0f7d429a0 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -4,8 +4,6 @@ fetchurl, libpcap, tcpdump, - Carbon, - CoreServices, }: stdenv.mkDerivation rec { @@ -17,12 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Leeb/Wfsksqa4v+1BFbdHVP/QPP6cbQixl6AYgE8noU="; }; - buildInputs = - [ libpcap ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreServices - ]; + buildInputs = [ libpcap ]; configureFlags = [ "--disable-local-libopts" diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index 788ea6bfbe05..4d6b2eccebac 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, openssl, pkg-config, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,10 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QXkKqEEbNEDcypErDIFarJLuIoYWOZj/9jCbslxrOXs="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - [ ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; meta = with lib; { description = "Expose your local web server to the internet with a public URL"; diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index d6c66cc514cd..bab5c1c96643 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -1,8 +1,5 @@ { lib, - stdenv, - AppKit, - Security, fetchFromGitLab, rustPlatform, protobuf, @@ -33,11 +30,6 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Security - ]; - cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/tools/networking/wg-netmanager/default.nix b/pkgs/tools/networking/wg-netmanager/default.nix index 31bb2df07c36..bd5f76c3591e 100644 --- a/pkgs/tools/networking/wg-netmanager/default.nix +++ b/pkgs/tools/networking/wg-netmanager/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-LtZTfmVVUqxc9GAM6mLLmlJXBhLqnfrvBZWh0RWrR/0="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - # Test 01 tries to create a wireguard interface, which requires sudo. doCheck = true; checkFlags = [ diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index 6f819fb734ef..f2827a2035ad 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -59,7 +59,6 @@ assert lib.assertMsg ( python3, pkg-config, rapidcheck, - Security, sqlite, util-linuxMinimal, removeReferencesTo, @@ -183,7 +182,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals hasExternalLixDoc [ lix-doc ] ++ lib.optionals (!isLegacyParser) [ pegtl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ] # NOTE(Raito): I'd have expected that the LLVM packaging would inject the # libunwind library path directly in the wrappers, but it does inject # -lunwind without injecting the library path... diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 21834a5299c3..40efaababbe8 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -1,16 +1,15 @@ { lib, + stdenv, aws-sdk-cpp, boehmgc, callPackage, fetchgit, fetchFromGitHub, rustPlatform, - Security, newScope, editline, ncurses, - stdenv, clangStdenv, storeDir ? "/nix/store", @@ -31,7 +30,6 @@ let self: lib.recurseIntoAttrs { inherit - Security storeDir stateDir confDir diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 369eec6c9f88..8e346aa7eb67 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, nixVersions, nlohmann_json, boost, graphviz, - Security, pkg-config, }: @@ -35,7 +33,7 @@ rustPlatform.buildRustPackage rec { boost nixVersions.nix_2_24 nlohmann_json - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index de1cf8319039..e4a7c6077ba0 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, sqlite, - Security, }: rustPlatform.buildRustPackage rec { @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { openssl curl sqlite - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; postInstall = '' substituteInPlace command-not-found.sh \ diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 1f255aef6796..e81ac8de681d 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -8,7 +8,6 @@ nix, openssl, pkg-config, - Security, }: rustPlatform.buildRustPackage rec { @@ -32,7 +31,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; # needed for nix-prefetch-url postInstall = diff --git a/pkgs/tools/package-management/nix/common-autoconf.nix b/pkgs/tools/package-management/nix/common-autoconf.nix index 1617854abcd2..a5626acce414 100644 --- a/pkgs/tools/package-management/nix/common-autoconf.nix +++ b/pkgs/tools/package-management/nix/common-autoconf.nix @@ -36,7 +36,6 @@ in callPackage, coreutils, curl, - darwin, docbook_xsl_ns, docbook5, editline, @@ -66,7 +65,6 @@ in python3, pkg-config, rapidcheck, - Security, sqlite, util-linuxMinimal, xz, @@ -168,9 +166,6 @@ let ++ lib.optionals (atLeast225 && enableDocumentation) [ python3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ] @@ -179,9 +174,6 @@ let ] ++ lib.optionals withAWS [ aws-sdk-cpp - ] - ++ lib.optional (atLeast224 && stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.libs.sandbox ]; propagatedBuildInputs = @@ -308,7 +300,6 @@ let perl-bindings = perl.pkgs.toPerlModule ( callPackage ./nix-perl.nix { nix = self; - inherit Security; } ); diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix index 2639da6b8eca..553b8a3d3e59 100644 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -29,7 +29,6 @@ assert (hash == null) -> (src != null); callPackage, cmake, curl, - darwin, doxygen, editline, flex, @@ -58,7 +57,6 @@ assert (hash == null) -> (src != null); pkg-config, rapidcheck, rsync, - Security, sqlite, util-linuxMinimal, xz, @@ -151,9 +149,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (lib.versionAtLeast version "2.26") [ libblake3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ libcpuid ] @@ -162,9 +157,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withAWS [ aws-sdk-cpp - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.libs.sandbox ]; propagatedBuildInputs = [ @@ -245,7 +237,6 @@ stdenv.mkDerivation (finalAttrs: { perl-bindings = perl.pkgs.toPerlModule ( callPackage ./nix-perl.nix { nix = finalAttrs.finalPackage; - inherit Security; } ); diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 700cf33e4d4d..2bc44e82382b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, fetchpatch2, runCommand, - Security, pkgs, pkgsi686Linux, pkgsStatic, @@ -26,7 +25,6 @@ let (import ./common-autoconf.nix ({ inherit lib fetchFromGitHub; } // args)) { inherit - Security storeDir stateDir confDir @@ -44,7 +42,6 @@ let args: nixDependencies.callPackage (import ./common-meson.nix ({ inherit lib fetchFromGitHub; } // args)) { inherit - Security storeDir stateDir confDir diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index 63ea2c743687..e005000a737b 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -4,7 +4,6 @@ mkMesonLibrary, unixtools, - darwin, nix-util, boost, @@ -39,7 +38,6 @@ mkMesonLibrary (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp # There have been issues building these dependencies - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox ++ lib.optional ( stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin) ) aws-sdk-cpp; diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index f3b42e4c7c2e..38478c79c0d7 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -10,7 +10,6 @@ autoreconfHook, autoconf-archive, xz, - Security, meson, ninja, bzip2, @@ -47,18 +46,15 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'config-store.hh' 'nix/config.h' ''; - buildInputs = - [ - boost - bzip2 - curl - libsodium - nix - perl - xz - ] - ++ lib.optional (stdenv.hostPlatform.isDarwin) Security - ++ lib.optional atLeast226 libarchive; + buildInputs = [ + boost + bzip2 + curl + libsodium + nix + perl + xz + ] ++ lib.optional atLeast226 libarchive; # Not cross-safe since Nix checks for curl/perl via # NEED_PROG/find_program, but both seem to be needed at runtime diff --git a/pkgs/tools/security/age-plugin-ledger/default.nix b/pkgs/tools/security/age-plugin-ledger/default.nix index 9c441ccda539..c885ff169ff8 100644 --- a/pkgs/tools/security/age-plugin-ledger/default.nix +++ b/pkgs/tools/security/age-plugin-ledger/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, libusb1, openssl, rage, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -31,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; + ]; nativeCheckInputs = [ rage diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index afa9701563db..6cafb20cee6e 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -15,7 +15,6 @@ pcre2, libmspack, systemd, - Foundation, json_c, check, rustc, @@ -50,23 +49,20 @@ stdenv.mkDerivation rec { cargo python3 ]; - buildInputs = - [ - zlib - bzip2 - libxml2 - openssl - ncurses - curl - libiconv - libmilter - pcre2 - libmspack - json_c - check - ] - ++ lib.optional stdenv.hostPlatform.isLinux systemd - ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; + buildInputs = [ + zlib + bzip2 + libxml2 + openssl + ncurses + curl + libiconv + libmilter + pcre2 + libmspack + json_c + check + ] ++ lib.optional stdenv.hostPlatform.isLinux systemd; cmakeFlags = [ "-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd" diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 9c70795da08b..52de7fc557cd 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -6,7 +6,6 @@ pcsclite, pkg-config, installShellFiles, - PCSC, pivKeySupport ? true, pkcs11Support ? true, testers, @@ -23,9 +22,7 @@ buildGoModule (finalAttrs: { hash = "sha256-QvU+JpIcE9EX+ehRWvs2bS2VGgGVekNX8f5+mITIwU0="; }; - buildInputs = - lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite) - ++ lib.optionals (stdenv.hostPlatform.isDarwin && pivKeySupport) [ PCSC ]; + buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite); nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 2d650d3ac395..9540e6dc3dd0 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -7,8 +7,6 @@ libgpg-error, pkg-config, python3, - AppKit, - Foundation, libiconv, libobjc, libresolv, @@ -48,8 +46,6 @@ rustPlatform.buildRustPackage rec { libxkbcommon ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Foundation libiconv libobjc libresolv diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index d3eda42db806..994c6daa561a 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -12,10 +12,6 @@ ocl-icd, xxHash, zlib, - Foundation, - IOKit, - Metal, - OpenCL, libiconv, }: @@ -54,10 +50,6 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - IOKit - Metal - OpenCL libiconv ]; diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 056d9699a745..22263bb8d5b5 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -6,8 +6,6 @@ installShellFiles, python3, libxcb, - AppKit, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; - buildInputs = - [ ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - SystemConfiguration - AppKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index c58852e05ab8..cbc4e5a19fa3 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,17 +1,8 @@ { - stdenv, replaceVars, lib, buildGoModule, fetchFromGitHub, - AppKit, - AVFoundation, - AudioToolbox, - ImageIO, - CoreMedia, - Foundation, - CoreGraphics, - MediaToolbox, gnupg, }: @@ -41,17 +32,6 @@ buildGoModule rec { gpg2 = "${gnupg}/bin/gpg2"; }) ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - AVFoundation - AudioToolbox - ImageIO - CoreMedia - Foundation - CoreGraphics - MediaToolbox - ]; tags = [ "production" ]; ldflags = [ "-s" diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix index c654c975eebc..182258015850 100644 --- a/pkgs/tools/security/lethe/default.nix +++ b/pkgs/tools/security/lethe/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Ky39RpLoYks4xDiheSsrUj3l/ZrGcY+y5IuDZ28pH/c="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - meta = with lib; { description = "Tool to wipe drives in a secure way"; homepage = "https://github.com/kostassoid/lethe"; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index c5e4ad0aca1d..a4ac9de90bd4 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -6,7 +6,6 @@ pkg-config, pcsclite, libusb-compat-0_1, - IOKit, }: stdenv.mkDerivation { @@ -27,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ pcsclite libusb-compat-0_1 - ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; + ]; preBuild = '' makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); diff --git a/pkgs/tools/security/pcsc-tools/default.nix b/pkgs/tools/security/pcsc-tools/default.nix index 4e41a44a92ff..6b724185b9c4 100644 --- a/pkgs/tools/security/pcsc-tools/default.nix +++ b/pkgs/tools/security/pcsc-tools/default.nix @@ -13,7 +13,6 @@ dbusSupport ? stdenv.hostPlatform.isLinux, dbus, pcsclite, - PCSC, wget, coreutils, perlPackages, @@ -49,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { perlPackages.perl pcsclite ] - ++ lib.optional stdenv.hostPlatform.isDarwin PCSC ++ lib.optional systemdSupport systemd; nativeBuildInputs = diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 9b01613a8082..4fd0d974e94d 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -17,8 +17,6 @@ systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs, udevSupport ? dbusSupport, libusb1, - Foundation, - IOKit, testers, nix-update-script, pname ? "pcsclite", @@ -110,10 +108,6 @@ stdenv.mkDerivation (finalAttrs: { [ python3 ] ++ lib.optionals systemdSupport [ systemdLibs ] ++ lib.optionals (!systemdSupport && udevSupport) [ udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - IOKit - ] ++ lib.optionals dbusSupport [ dbus ] ++ lib.optionals polkitSupport [ polkit ] ++ lib.optionals (!udevSupport) [ libusb1 ]; diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index 877ba4a65775..6b86a9a76fd7 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -12,8 +12,6 @@ whereami, lua, lz4, - Foundation, - AppKit, withGui ? true, wrapQtAppsHook, qtbase, @@ -73,11 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional withGui qtbase ++ lib.optional withPython python3 - ++ lib.optional withBlueshark bluez5 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - AppKit - ]; + ++ lib.optional withBlueshark bluez5; makeFlags = [ diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix index 8f9cf642c969..d1464f0442c3 100644 --- a/pkgs/tools/security/quill/default.nix +++ b/pkgs/tools/security/quill/default.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, openssl, - Security, libiconv, udev, pkg-config, @@ -58,7 +57,6 @@ rustPlatform.buildRustPackage rec { udev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security libiconv ]; diff --git a/pkgs/tools/security/rblake2sum/default.nix b/pkgs/tools/security/rblake2sum/default.nix index 06b1853cf5c5..8dc252af0539 100644 --- a/pkgs/tools/security/rblake2sum/default.nix +++ b/pkgs/tools/security/rblake2sum/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - Security, }: rustPlatform.buildRustPackage { pname = "rblake2sum"; @@ -19,8 +17,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-wIJWwU4D0OeVa2RMgmpN512TIvNdcBdorXU8KfFRTIg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - meta = with lib; { description = "Recursive blake2 digest (hash) of a file-system path"; homepage = "https://github.com/crev-dev/rblake2sum"; diff --git a/pkgs/tools/security/rblake3sum/default.nix b/pkgs/tools/security/rblake3sum/default.nix index 19428078db00..1e0ad125994b 100644 --- a/pkgs/tools/security/rblake3sum/default.nix +++ b/pkgs/tools/security/rblake3sum/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - Security, }: rustPlatform.buildRustPackage { pname = "rblake3sum"; @@ -19,8 +17,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-cxPNqUVNMkNY9Ov7/ajTAwnBd2j/gKDHVLXPtd1aPVA="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - meta = with lib; { description = "Recursive blake3 digest (hash) of a file-system path"; homepage = "https://github.com/rustshop/rblake3sum"; diff --git a/pkgs/tools/security/rucredstash/default.nix b/pkgs/tools/security/rucredstash/default.nix index f98cd0f74858..3a352a29fc08 100644 --- a/pkgs/tools/security/rucredstash/default.nix +++ b/pkgs/tools/security/rucredstash/default.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-QylZkqE8my2ldCjtg3++6TTDm0om3SVp0jwYUZ9qVes="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure doCheck = false; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index 6800e96ffaa9..c012668a34fe 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitHub, nmap, perl, python3, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -29,8 +27,6 @@ rustPlatform.buildRustPackage rec { patchShebangs fixtures/.rustscan_scripts/* ''; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - nativeCheckInputs = [ perl python3 diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 6da20e6ba3e3..5a698ee06811 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -4,7 +4,6 @@ buildGoModule, fetchFromGitHub, installShellFiles, - AppKit, }: buildGoModule rec { @@ -21,7 +20,6 @@ buildGoModule rec { vendorHash = "sha256-oCYtEMx3+wK1TyS18iYgRwH3NopWY63xsguvanNDSEo="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; subPackages = [ "." diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 3cbf2e759418..8436bdc81819 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -5,7 +5,6 @@ botan2, sqlite, libobjc, - Security, }: stdenv.mkDerivation rec { @@ -28,7 +27,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - Security ]; buildInputs = [ diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index 99a633dafe61..18f5e509a71f 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -7,10 +7,6 @@ pkg-config, pcsclite, udev, - PCSC, - IOKit, - CoreFoundation, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -37,12 +33,6 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - PCSC - IOKit - CoreFoundation - AppKit ]; postInstall = '' diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index de0793a6a89c..0eba9e6e26c6 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -8,9 +8,6 @@ pkg-config, openssl, libiconv, - Security, - CoreServices, - SystemConfiguration, dbBackend ? "sqlite", libmysqlclient, libpq, @@ -42,9 +39,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security - CoreServices - SystemConfiguration ] ++ lib.optional (dbBackend == "mysql") libmysqlclient ++ lib.optional (dbBackend == "postgresql") libpq; diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index 4db3a1d780ba..5eb7ef8dfc68 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, ocl-icd, opencl-headers, - OpenCL, }: stdenv.mkDerivation rec { @@ -18,14 +17,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow="; }; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ - ocl-icd - opencl-headers - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - OpenCL - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + ocl-icd + opencl-headers + ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 4be42d86237e..90645a045a49 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, fetchpatch, - darwin, callPackage, autoreconfHook, pkg-config, @@ -41,14 +40,9 @@ stdenv.mkDerivation rec { pkg-config autoreconfHook ]; - buildInputs = - [ - libtool - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices - ] - ++ plugins.buildInputs; + buildInputs = [ + libtool + ] ++ plugins.buildInputs; configureFlags = [ diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 2a716b0ab3f2..44301c956d9e 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -42,7 +42,6 @@ varnish, xen, yajl, - IOKit, # Defaults to `null` for all supported plugins (except xen, which is marked as # insecure), otherwise a list of plugin names for a custom build enabledPlugins ? null, @@ -61,9 +60,6 @@ let curl libxml2 ]; - battery.buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - ]; bind.buildInputs = [ curl libxml2 @@ -79,13 +75,9 @@ let libxml2 ]; dbi.buildInputs = [ libdbi ]; - disk.buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - ]; + disk.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + udev + ]; dns.buildInputs = [ libpcap ]; ipmi.buildInputs = [ openipmi ]; iptables.buildInputs = diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index d61e7432ce10..ded71d3bf8d1 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -1,10 +1,8 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, installShellFiles, - IOKit, writableTmpDirAsHomeHook, }: @@ -34,9 +32,6 @@ buildGoModule (finalAttrs: { ]; nativeBuildInputs = [ installShellFiles ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; - nativeCheckInputs = [ writableTmpDirAsHomeHook ]; postInstall = '' diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 87c6e6b30f9a..ad416c4b77bb 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -5,7 +5,6 @@ autoreconfHook, pkg-config, ncurses, - IOKit, libcap, libnl, sensorsSupport ? stdenv.hostPlatform.isLinux, @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] - ++ lib.optional stdenv.hostPlatform.isDarwin IOKit ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnl diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index b1a3714ee591..06c5879297b7 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -7,7 +7,6 @@ cmake, cups, curl, - darwin, freeipmi, go, google-cloud-cpp, @@ -97,14 +96,10 @@ stdenv'.mkDerivation (finalAttrs: { zlib libyaml ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - IOKit - libossp_uuid - ] - ) + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libossp_uuid + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libcap libuuid diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 345afacf0016..8224369d0992 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,7 +8,6 @@ which, hwdata, static ? stdenv.hostPlatform.isStatic, - IOKit, gitUpdater, }: @@ -24,13 +23,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - which - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ kmod ]; + buildInputs = [ + which + zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ kmod ]; preConfigure = lib.optionalString (!stdenv.cc.isGNU) '' substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index ed3cbe37b2c0..8887d0623776 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -11,11 +11,6 @@ perl, # For building web manuals which, ed, - Carbon, - Cocoa, - IOKit, - Metal, - QuartzCore, DarwinTools, # For building on Darwin }: @@ -66,11 +61,6 @@ stdenv.mkDerivation rec { ] else [ - Carbon - Cocoa - IOKit - Metal - QuartzCore DarwinTools ] ); diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index d4b80e17bc96..a08ab722aeec 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -8,8 +8,6 @@ hostname, mailutils, systemdLibs, - IOKit, - ApplicationServices, }: let @@ -53,12 +51,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = - lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemdLibs) [ systemdLibs ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - ApplicationServices - ]; + buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemdLibs) [ systemdLibs ]; enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/tools/text/autocorrect/default.nix b/pkgs/tools/text/autocorrect/default.nix index 29b3f9ed2ea7..ec62b9adca50 100644 --- a/pkgs/tools/text/autocorrect/default.nix +++ b/pkgs/tools/text/autocorrect/default.nix @@ -1,10 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -26,11 +23,6 @@ rustPlatform.buildRustPackage rec { cp ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - cargoBuildFlags = [ "-p" "autocorrect-cli" diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index 02933bf8fa2d..ae87f1efd6c8 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, nix-update-script, }: @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Df+twOjzfq+Vxzuv+APiy94XmhBajgk+6+1BRFf+xm0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; }; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 3b9c6d2b383a..08bf30cb08ba 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-aZkWzJaEW6/fiCfb+RKNef0eJf/CJW8OU1N2OlHwuJM="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - meta = with lib; { description = "Colourise your checksum output"; mainProgram = "coloursum"; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index e3502dd3c54f..a599e8188400 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-pbGfoEk8peWBA0F0EdiAJJtan74O5RD6TmNJUTY2ijA="; - buildInputs = (lib.optional stdenv.hostPlatform.isDarwin Security); - preCheck = '' export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr ''; diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index 5d94bd299fd0..0c238b3bc21b 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, rustPlatform, libiconv, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security ]; meta = with lib; { diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index 77537ec0adbd..fd36e112b38b 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - Security, testers, igrep, }: @@ -22,8 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-NZN9pB9McZkTlpGgAbxi8bwn+aRiPMymGmBLYBc6bmw="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - passthru.tests = { version = testers.testVersion { package = igrep; diff --git a/pkgs/tools/text/languagetool-rust/default.nix b/pkgs/tools/text/languagetool-rust/default.nix index 389f36581b22..a740365f7a5a 100644 --- a/pkgs/tools/text/languagetool-rust/default.nix +++ b/pkgs/tools/text/languagetool-rust/default.nix @@ -6,7 +6,6 @@ installShellFiles, pkg-config, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { installShellFiles pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; checkFlags = [ # requires network access diff --git a/pkgs/tools/text/mdbook-linkcheck/default.nix b/pkgs/tools/text/mdbook-linkcheck/default.nix index 474f4f5004c5..498cb0f85582 100644 --- a/pkgs/tools/text/mdbook-linkcheck/default.nix +++ b/pkgs/tools/text/mdbook-linkcheck/default.nix @@ -5,7 +5,6 @@ rustPlatform, pkg-config, openssl, - Security, testers, mdbook-linkcheck, }: @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Tt7ljjWv2CMtP/ELZNgSH/ifmBk/42+E0r9ZXQEJNP8="; - buildInputs = if stdenv.hostPlatform.isDarwin then [ Security ] else [ openssl ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 4133f5cecda2..75f05104bd6e 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -7,8 +7,6 @@ pkg-config, asciidoctor, openssl, - Security, - SystemConfiguration, ansi2html, installShellFiles, }: @@ -29,15 +27,10 @@ rustPlatform.buildRustPackage rec { asciidoctor installShellFiles ]; - buildInputs = - [ - curl - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ + curl + openssl + ]; useFetchCargoVendor = true; cargoHash = "sha256-8A0RLbFkh3fruZAbjJzipQvuFLchqIRovPcc6MSKdOc="; diff --git a/pkgs/tools/text/pinyin-tool/default.nix b/pkgs/tools/text/pinyin-tool/default.nix index 05dd8c2305c7..bbd3e0b42097 100644 --- a/pkgs/tools/text/pinyin-tool/default.nix +++ b/pkgs/tools/text/pinyin-tool/default.nix @@ -1,9 +1,7 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-SOeyk2uWCdO99ooQc2L1eXlV77lR4DLBK6PnV6Ur49A="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - meta = with lib; { description = "Simple command line tool for converting Chinese characters to space-separate pinyin words"; mainProgram = "pinyin-tool"; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index afb2e7f55660..4e317167864d 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, rustPlatform, @@ -8,7 +7,6 @@ pandoc, poppler-utils, ripgrep, - Security, zip, fzf, }: @@ -44,7 +42,6 @@ rustPlatform.buildRustPackage rec { makeWrapper poppler-utils ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeCheckInputs = path; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 143b919778cb..6f5e643826c2 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -7,8 +7,6 @@ cups, libpng, libjpeg, - SystemConfiguration, - Foundation, pkg-config, htmldoc, }: @@ -24,17 +22,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - zlib - cups - libpng - libjpeg - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - SystemConfiguration - ]; + buildInputs = [ + zlib + cups + libpng + libjpeg + ]; # do not generate universal binary on Darwin # because it is not supported by Nix's clang diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 3b5ccde7979e..823693975ac0 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, zlib, - Cocoa, }: stdenv.mkDerivation rec { @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + buildInputs = [ zlib ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index a888e091b4d6..8ad5b99c893f 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, openssl, ffmpeg, - Security, }: rustPlatform.buildRustPackage rec { @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; postInstall = '' wrapProgram $out/bin/yaydl \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c28e69d19d74..454f18117306 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -950,9 +950,7 @@ with pkgs; makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; - mitm-cache = callPackage ../build-support/mitm-cache { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mitm-cache = callPackage ../build-support/mitm-cache { }; # intended to be used like nix-build -E 'with import { }; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; @@ -1025,7 +1023,7 @@ with pkgs; _1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; }; - _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { }; + _7zz = callPackage ../tools/archivers/7zz { }; _7zz-rar = _7zz.override { enableUnfree = true; }; acquire = with python3Packages; toPythonApplication acquire; @@ -1116,14 +1114,7 @@ with pkgs; fontbakery = with python3Packages; toPythonApplication fontbakery; - weylus = callPackage ../applications/graphics/weylus { - inherit (darwin.apple_sdk.frameworks) - ApplicationServices - Carbon - Cocoa - VideoToolbox - ; - }; + weylus = callPackage ../applications/graphics/weylus { }; genealogos-api = genealogos-cli.override { crate = "api"; @@ -1265,7 +1256,6 @@ with pkgs; ### APPLICATIONS/VERSION-MANAGEMENT git = callPackage ../applications/version-management/git { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; perlLibs = [ perlPackages.LWP perlPackages.URI @@ -1354,17 +1344,13 @@ with pkgs; git-fame = callPackage ../applications/version-management/git-fame { }; - git-gone = callPackage ../applications/version-management/git-gone { - inherit (darwin.apple_sdk.frameworks) Security; - }; + git-gone = callPackage ../applications/version-management/git-gone { }; git-imerge = python3Packages.callPackage ../applications/version-management/git-imerge { }; git-machete = python3Packages.callPackage ../applications/version-management/git-machete { }; - git-ps-rs = callPackage ../development/tools/git-ps-rs { - inherit (darwin.apple_sdk.frameworks) Security; - }; + git-ps-rs = callPackage ../development/tools/git-ps-rs { }; git-publish = python3Packages.callPackage ../applications/version-management/git-publish { }; @@ -1379,9 +1365,7 @@ with pkgs; git-review = python3Packages.callPackage ../applications/version-management/git-review { }; - git-stack = callPackage ../applications/version-management/git-stack { - inherit (darwin.apple_sdk.frameworks) Security; - }; + git-stack = callPackage ../applications/version-management/git-stack { }; git-up = callPackage ../applications/version-management/git-up { pythonPackages = python3Packages; @@ -1391,9 +1375,7 @@ with pkgs; gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { }; - lucky-commit = callPackage ../applications/version-management/lucky-commit { - inherit (darwin.apple_sdk.frameworks) OpenCL; - }; + lucky-commit = callPackage ../applications/version-management/lucky-commit { }; merge-fmt = callPackage ../applications/version-management/merge-fmt { inherit (ocamlPackages) @@ -1463,13 +1445,10 @@ with pkgs; cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; dosbox = callPackage ../applications/emulators/dosbox { - inherit (darwin.apple_sdk.frameworks) OpenGL; SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat; }; - dosbox-x = darwin.apple_sdk_11_0.callPackage ../applications/emulators/dosbox-x { - inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; - }; + dosbox-x = callPackage ../applications/emulators/dosbox-x { }; fceux-qt5 = fceux.override { ___qtVersion = "5"; }; fceux-qt6 = fceux.override { ___qtVersion = "6"; }; @@ -1620,19 +1599,12 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - kitty = darwin.apple_sdk_11_0.callPackage ../by-name/ki/kitty/package.nix { + kitty = callPackage ../by-name/ki/kitty/package.nix { harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; }; inherit (darwin) autoSignDarwinBinariesHook; - inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) - Cocoa - Kernel - UniformTypeIdentifiers - UserNotifications - ; }; - mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { }; + mlterm = callPackage ../applications/terminal-emulators/mlterm { }; mlterm-wayland = mlterm.override { enableX11 = false; }; @@ -1672,9 +1644,7 @@ with pkgs; twine = with python3Packages; toPythonApplication twine; - amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { - inherit (darwin.apple_sdk.frameworks) Security; - }; + amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { }; inherit (callPackages ../development/tools/ammonite { }) ammonite_2_12 @@ -1683,7 +1653,7 @@ with pkgs; ; ammonite = ammonite_3_3; - android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools { }); + android-tools = lowPrio (callPackage ../tools/misc/android-tools { }); angie = callPackage ../servers/http/angie { zlib-ng = zlib-ng.override { withZlibCompat = true; }; @@ -1740,9 +1710,7 @@ with pkgs; asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { }; - atomicparsley = callPackage ../tools/video/atomicparsley { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + atomicparsley = callPackage ../tools/video/atomicparsley { }; authelia = callPackage ../servers/authelia { buildGoModule = buildGo124Module; @@ -1759,21 +1727,9 @@ with pkgs; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; - binocle = callPackage ../applications/misc/binocle { - inherit (darwin.apple_sdk.frameworks) - AppKit - CoreFoundation - CoreGraphics - CoreVideo - Foundation - Metal - QuartzCore - ; - }; + binocle = callPackage ../applications/misc/binocle { }; - blisp = darwin.apple_sdk_11_0.callPackage ../development/embedded/blisp { - inherit (darwin.apple_sdk_11_0.frameworks) IOKit; - }; + blisp = callPackage ../development/embedded/blisp { }; brakeman = callPackage ../development/tools/analysis/brakeman { }; @@ -1795,9 +1751,7 @@ with pkgs; else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}"; - chars = callPackage ../tools/text/chars { - inherit (darwin.apple_sdk.frameworks) Security; - }; + chars = callPackage ../tools/text/chars { }; crystfel = callPackage ../applications/science/physics/crystfel { }; @@ -1863,9 +1817,7 @@ with pkgs; corsair = with python3Packages; toPythonApplication corsair-scan; - cosign = callPackage ../tools/security/cosign { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; + cosign = callPackage ../tools/security/cosign { }; inherit (cue) writeCueValidator; @@ -1881,9 +1833,7 @@ with pkgs; forPlatform = stdenv.targetPlatform; # offset by 1 so it works in nativeBuildInputs }; - diskus = callPackage ../tools/misc/diskus { - inherit (darwin.apple_sdk.frameworks) Security; - }; + diskus = callPackage ../tools/misc/diskus { }; dkimpy = with python3Packages; toPythonApplication dkimpy; @@ -1897,9 +1847,7 @@ with pkgs; libfx2 = with python3Packages; toPythonApplication fx2; - fastmod = callPackage ../tools/text/fastmod { - inherit (darwin.apple_sdk.frameworks) Security; - }; + fastmod = callPackage ../tools/text/fastmod { }; flirc = libsForQt5.callPackage ../applications/video/flirc { readline = readline70; @@ -1927,14 +1875,7 @@ with pkgs; glaxnimate = libsForQt5.callPackage ../applications/video/glaxnimate { }; - go2tv = darwin.apple_sdk_11_0.callPackage ../applications/video/go2tv { - inherit (darwin.apple_sdk_11_0.frameworks) - Carbon - Cocoa - Kernel - UserNotifications - ; - }; + go2tv = callPackage ../applications/video/go2tv { }; go2tv-lite = go2tv.override { withGui = false; }; guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { }; @@ -1949,9 +1890,7 @@ with pkgs; openjdk = openjdk11; }; - grex = callPackage ../tools/misc/grex { - inherit (darwin.apple_sdk.frameworks) Security; - }; + grex = callPackage ../tools/misc/grex { }; hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; @@ -1978,9 +1917,7 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; - inherd-quake = callPackage ../applications/misc/inherd-quake { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + inherd-quake = callPackage ../applications/misc/inherd-quake { }; gopass = callPackage ../tools/security/gopass { }; @@ -1993,16 +1930,9 @@ with pkgs; kerf = kerf_1; # kerf2 is WIP kerf_1 = callPackage ../development/interpreters/kerf { stdenv = clangStdenv; - inherit (darwin.apple_sdk.frameworks) - Accelerate - CoreGraphics - CoreVideo - ; }; - khd = callPackage ../os-specific/darwin/khd { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; + khd = callPackage ../os-specific/darwin/khd { }; kjv = callPackage ../applications/misc/kjv { }; @@ -2015,9 +1945,7 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { }; - qes = callPackage ../os-specific/darwin/qes { - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + qes = callPackage ../os-specific/darwin/qes { }; xcodeenv = callPackage ../development/mobile/xcodeenv { }; @@ -2045,15 +1973,11 @@ with pkgs; novacomd = callPackage ../development/mobile/webos/novacomd.nix { }; }; - aoc-cli = callPackage ../tools/misc/aoc-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + aoc-cli = callPackage ../tools/misc/aoc-cli { }; apprise = with python3Packages; toPythonApplication apprise; - aria2 = callPackage ../tools/networking/aria2 { - inherit (darwin.apple_sdk.frameworks) Security; - }; + aria2 = callPackage ../tools/networking/aria2 { }; asmrepl = callPackage ../development/interpreters/asmrepl { }; @@ -2123,7 +2047,7 @@ with pkgs; behave = with python3Packages; toPythonApplication behave; - blink = darwin.apple_sdk_11_0.callPackage ../applications/emulators/blink { }; + blink = callPackage ../applications/emulators/blink { }; blockdiag = with python3Packages; toPythonApplication blockdiag; @@ -2147,9 +2071,7 @@ with pkgs; buildah = callPackage ../development/tools/buildah/wrapper.nix { }; buildah-unwrapped = callPackage ../development/tools/buildah { }; - c3d = callPackage ../applications/graphics/c3d { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + c3d = callPackage ../applications/graphics/c3d { }; cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables ( haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix @@ -2270,13 +2192,9 @@ with pkgs; cplex = callPackage ../applications/science/math/cplex (config.cplex or { }); - contacts = callPackage ../tools/misc/contacts { - inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; - }; + contacts = callPackage ../tools/misc/contacts { }; - coloursum = callPackage ../tools/text/coloursum { - inherit (darwin.apple_sdk.frameworks) Security; - }; + coloursum = callPackage ../tools/text/coloursum { }; cot = with python3Packages; toPythonApplication cot; @@ -2298,9 +2216,7 @@ with pkgs; dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { }; - dijo = callPackage ../tools/misc/dijo { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + dijo = callPackage ../tools/misc/dijo { }; ding = callPackage ../applications/misc/ding { aspellDicts_de = aspellDicts.de; @@ -2331,9 +2247,7 @@ with pkgs; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; - dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { }; inherit (ocamlPackages) dot-merlin-reader; @@ -2385,23 +2299,17 @@ with pkgs; # If buildGoModule is overridden, provide a matching version of the go attribute }; - f3d = callPackage ../applications/graphics/f3d { - inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - }; + f3d = callPackage ../applications/graphics/f3d { }; f3d_egl = f3d.override { vtk_9 = vtk_9_egl; }; fast-cli = nodePackages.fast-cli; - fast-ssh = callPackage ../tools/networking/fast-ssh { - inherit (darwin.apple_sdk.frameworks) Security; - }; + fast-ssh = callPackage ../tools/networking/fast-ssh { }; fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { }; - flowgger = callPackage ../tools/misc/flowgger { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + flowgger = callPackage ../tools/misc/flowgger { }; ### TOOLS/TYPESETTING/TEX @@ -2435,32 +2343,26 @@ with pkgs; ; texlivePackages = recurseIntoAttrs (lib.mapAttrs (_: v: v.build) texlive.pkgs); - fondu = callPackage ../tools/misc/fondu { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + fondu = callPackage ../tools/misc/fondu { }; futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark; qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; - fwup = callPackage ../tools/misc/fwup { - inherit (darwin.apple_sdk.frameworks) DiskArbitration; - }; + fwup = callPackage ../tools/misc/fwup { }; g2o = libsForQt5.callPackage ../development/libraries/g2o { }; inherit (go-containerregistry) crane gcrane; - geckodriver = callPackage ../development/tools/geckodriver { - inherit (darwin.apple_sdk.frameworks) Security; - }; + geckodriver = callPackage ../development/tools/geckodriver { }; geekbench_4 = callPackage ../tools/misc/geekbench/4.nix { }; geekbench_5 = callPackage ../tools/misc/geekbench/5.nix { }; geekbench_6 = callPackage ../tools/misc/geekbench/6.nix { }; geekbench = geekbench_6; - ghidra = darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix { + ghidra = callPackage ../tools/security/ghidra/build.nix { protobuf = protobuf_21; }; @@ -2468,12 +2370,9 @@ with pkgs; ghidra-bin = callPackage ../tools/security/ghidra { }; - glslviewer = callPackage ../development/tools/glslviewer { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + glslviewer = callPackage ../development/tools/glslviewer { }; gpg-tui = callPackage ../tools/security/gpg-tui { - inherit (darwin.apple_sdk.frameworks) AppKit Foundation; inherit (darwin) libobjc libresolv; }; @@ -2509,20 +2408,11 @@ with pkgs; intensity-normalization = with python3Packages; toPythonApplication intensity-normalization; - jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { - inherit (darwin.apple_sdk.frameworks) - CoreFoundation - Cocoa - CoreAudio - MediaPlayer - ; - }; + jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; - kaldi = callPackage ../tools/audio/kaldi { - inherit (darwin.apple_sdk.frameworks) Accelerate; - }; + kaldi = callPackage ../tools/audio/kaldi { }; klaus = with python3Packages; toPythonApplication klaus; @@ -2534,23 +2424,17 @@ with pkgs; klipper-genconf = callPackage ../servers/klipper/klipper-genconf.nix { }; - klipper-estimator = callPackage ../applications/misc/klipper-estimator { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + klipper-estimator = callPackage ../applications/misc/klipper-estimator { }; klog = qt5.callPackage ../applications/radio/klog { }; - krill = callPackage ../servers/krill { - inherit (darwin.apple_sdk.frameworks) Security; - }; + krill = callPackage ../servers/krill { }; lapce = callPackage ../applications/editors/lapce { inherit (darwin) libobjc; }; - languagetool-rust = callPackage ../tools/text/languagetool-rust { - inherit (darwin.apple_sdk.frameworks) Security; - }; + languagetool-rust = callPackage ../tools/text/languagetool-rust { }; lexicon = with python3Packages; toPythonApplication dns-lexicon; @@ -2558,9 +2442,7 @@ with pkgs; python = python3; }; - lite-xl = callPackage ../applications/editors/lite-xl { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + lite-xl = callPackage ../applications/editors/lite-xl { }; # Less secure variant of lowdown for use inside Nix builds. lowdown-unsandboxed = lowdown.override { @@ -2618,9 +2500,7 @@ with pkgs; mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { }; - nix-template = callPackage ../tools/package-management/nix-template { - inherit (darwin.apple_sdk.frameworks) Security; - }; + nix-template = callPackage ../tools/package-management/nix-template { }; nltk-data = callPackage ../tools/text/nltk-data { }; @@ -2634,9 +2514,7 @@ with pkgs; nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; - noti = callPackage ../tools/misc/noti { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + noti = callPackage ../tools/misc/noti { }; nsz = with python3.pkgs; toPythonApplication nsz; @@ -2648,17 +2526,11 @@ with pkgs; online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; - onnxruntime = callPackage ../development/libraries/onnxruntime { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + onnxruntime = callPackage ../development/libraries/onnxruntime { }; - ockam = callPackage ../tools/networking/ockam { - inherit (darwin.apple_sdk.frameworks) AppKit Security; - }; + ockam = callPackage ../tools/networking/ockam { }; - pastel = callPackage ../applications/misc/pastel { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pastel = callPackage ../applications/misc/pastel { }; inherit (ocamlPackages) patdiff; @@ -2668,31 +2540,21 @@ with pkgs; electron = electron_34; }; - pueue = darwin.apple_sdk_11_0.callPackage ../applications/misc/pueue { - inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; - }; + pueue = callPackage ../applications/misc/pueue { }; pixcat = with python3Packages; toPythonApplication pixcat; pyznap = python3Packages.callPackage ../tools/backup/pyznap { }; - procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs { - inherit (darwin.apple_sdk_11_0.frameworks) Security; - inherit (darwin.apple_sdk_11_0) Libsystem; - }; + procs = callPackage ../tools/admin/procs { }; psrecord = python3Packages.callPackage ../tools/misc/psrecord { }; rare = python3Packages.callPackage ../games/rare { }; - rblake2sum = callPackage ../tools/security/rblake2sum { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rblake2sum = callPackage ../tools/security/rblake2sum { }; - rblake3sum = callPackage ../tools/security/rblake3sum { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rblake3sum = callPackage ../tools/security/rblake3sum { }; rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; @@ -2702,17 +2564,13 @@ with pkgs; scour = with python3Packages; toPythonApplication scour; - sheldon = callPackage ../tools/misc/sheldon { - inherit (darwin.apple_sdk.frameworks) Security; - }; + sheldon = callPackage ../tools/misc/sheldon { }; steampipePackages = recurseIntoAttrs (callPackage ../tools/misc/steampipe-packages { }); swappy = callPackage ../applications/misc/swappy { gtk = gtk3; }; - synth = callPackage ../tools/misc/synth { - inherit (darwin.apple_sdk.frameworks) AppKit Security; - }; + synth = callPackage ../tools/misc/synth { }; inherit (callPackages ../servers/rainloop { }) rainloop-community @@ -2757,9 +2615,7 @@ with pkgs; withHiredis = false; }; - rtrtr = callPackage ../servers/rtrtr { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rtrtr = callPackage ../servers/rtrtr { }; xmlsort = perlPackages.XMLFilterSort; @@ -2800,9 +2656,7 @@ with pkgs; inherit (llvmPackages) openmp; }; - bacula = callPackage ../tools/backup/bacula { - inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit Kerberos; - }; + bacula = callPackage ../tools/backup/bacula { }; beamerpresenter = beamerpresenter-mupdf; @@ -2826,7 +2680,7 @@ with pkgs; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; - bupstash = darwin.apple_sdk_11_0.callPackage ../tools/backup/bupstash { }; + bupstash = callPackage ../tools/backup/bupstash { }; anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; @@ -2838,21 +2692,16 @@ with pkgs; stdenv = clangStdenv; }; - davix = callPackage ../tools/networking/davix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + davix = callPackage ../tools/networking/davix { }; davix-copy = davix.override { enableThirdPartyCopy = true; }; cdist = python3Packages.callPackage ../tools/admin/cdist { }; - cdrdao = callPackage ../tools/cd-dvd/cdrdao { - inherit (darwin.apple_sdk.frameworks) CoreServices IOKit; - }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; cdrtools = callPackage ../tools/cd-dvd/cdrtools { stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_14.stdenv else stdenv; - inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { }; @@ -2935,9 +2784,7 @@ with pkgs; enableWispr = false; }; - collectd = callPackage ../tools/system/collectd { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + collectd = callPackage ../tools/system/collectd { }; collectd-data = callPackage ../tools/system/collectd/data.nix { }; @@ -2949,9 +2796,7 @@ with pkgs; persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; - twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { - inherit (darwin.apple_sdk_11_0.frameworks) Security CoreServices SystemConfiguration; - }; + twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { }; inherit (import ../development/libraries/libsbsms pkgs) libsbsms @@ -3023,22 +2868,16 @@ with pkgs; { }; }; - age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger { }; blacken-docs = with python3Packages; toPythonApplication blacken-docs; - bore = callPackage ../tools/networking/bore { - inherit (darwin) Libsystem; - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - }; + bore = callPackage ../tools/networking/bore { }; bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; calyx-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn { provider = "calyx"; - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; cask-server = libsForQt5.callPackage ../applications/misc/cask-server { }; @@ -3053,7 +2892,6 @@ with pkgs; clamav = callPackage ../tools/security/clamav { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; cmdpack = callPackages ../tools/misc/cmdpack { }; @@ -3062,9 +2900,7 @@ with pkgs; cocoapods-beta = lowPrio (callPackage ../development/tools/cocoapods { beta = true; }); - cocom = callPackage ../tools/networking/cocom { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cocom = callPackage ../tools/networking/cocom { }; compass = callPackage ../development/tools/compass { }; @@ -3142,7 +2978,7 @@ with pkgs; opensslSupport = false; }; - curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }; + curl-impersonate = callPackage ../tools/networking/curl-impersonate { }; curl-impersonate-ff = curl-impersonate.curl-impersonate-ff; curl-impersonate-chrome = curl-impersonate.curl-impersonate-chrome; @@ -3150,9 +2986,7 @@ with pkgs; danger-gitlab = callPackage ../applications/version-management/danger-gitlab { }; - dar = callPackage ../tools/backup/dar { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; - }; + dar = callPackage ../tools/backup/dar { }; dconf2nix = callPackage ../development/tools/haskell/dconf2nix { }; @@ -3176,15 +3010,12 @@ with pkgs; enableBloat = false; }; - diffr = callPackage ../tools/text/diffr { - inherit (darwin.apple_sdk.frameworks) Security; - }; + diffr = callPackage ../tools/text/diffr { }; diffutils = callPackage ../tools/text/diffutils { }; dmd = callPackage ../by-name/dm/dmd/package.nix ( { - inherit (darwin.apple_sdk.frameworks) Foundation; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { # https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123 @@ -3192,9 +3023,7 @@ with pkgs; } ); - dogdns = callPackage ../tools/networking/dogdns { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dogdns = callPackage ../tools/networking/dogdns { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; @@ -3202,9 +3031,7 @@ with pkgs; sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; - drill = callPackage ../tools/networking/drill { - inherit (darwin.apple_sdk.frameworks) Security; - }; + drill = callPackage ../tools/networking/drill { }; drone = callPackage ../development/tools/continuous-integration/drone { }; drone-oss = callPackage ../development/tools/continuous-integration/drone { @@ -3222,9 +3049,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - dump_syms = callPackage ../development/tools/dump_syms { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + dump_syms = callPackage ../development/tools/dump_syms { }; dvtm = callPackage ../tools/misc/dvtm { # if you prefer a custom config, write the config.h in dvtm.config.h @@ -3244,26 +3069,15 @@ with pkgs; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; - mozwire = callPackage ../tools/networking/mozwire { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + mozwire = callPackage ../tools/networking/mozwire { }; - pax = callPackage ../tools/archivers/pax { - inherit (pkgs.darwin.apple_sdk.libs) utmp; - }; + pax = callPackage ../tools/archivers/pax { }; rocmPackages = rocmPackages_6; rocmPackages_5 = recurseIntoAttrs (callPackage ../development/rocm-modules/5 { }); rocmPackages_6 = recurseIntoAttrs (callPackage ../development/rocm-modules/6 { }); - solo2-cli = callPackage ../tools/security/solo2-cli { - inherit (darwin.apple_sdk.frameworks) - PCSC - IOKit - CoreFoundation - AppKit - ; - }; + solo2-cli = callPackage ../tools/security/solo2-cli { }; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; @@ -3289,17 +3103,13 @@ with pkgs; vorta = qt6Packages.callPackage ../applications/backup/vorta { }; - wrangler_1 = callPackage ../development/tools/wrangler_1 { - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; - }; + wrangler_1 = callPackage ../development/tools/wrangler_1 { }; xkcdpass = with python3Packages; toPythonApplication xkcdpass; - zee = callPackage ../applications/editors/zee { - inherit (darwin.apple_sdk.frameworks) Security; - }; + zee = callPackage ../applications/editors/zee { }; - zeek = darwin.apple_sdk_11_0.callPackage ../applications/networking/ids/zeek { }; + zeek = callPackage ../applications/networking/ids/zeek { }; zonemaster-cli = perlPackages.ZonemasterCLI; @@ -3336,21 +3146,13 @@ with pkgs; emborg = python3Packages.callPackage ../development/python-modules/emborg { }; - emulsion = callPackage ../applications/graphics/emulsion { - inherit (darwin.apple_sdk.frameworks) - AppKit - CoreGraphics - CoreServices - Foundation - OpenGL - ; - }; + emulsion = callPackage ../applications/graphics/emulsion { }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; }; - envchain = callPackage ../tools/misc/envchain { inherit (darwin.apple_sdk.frameworks) Security; }; + envchain = callPackage ../tools/misc/envchain { }; ethercalc = callPackage ../servers/web-apps/ethercalc { }; @@ -3396,9 +3198,7 @@ with pkgs; featherpad = qt5.callPackage ../applications/editors/featherpad { }; - ffsend = callPackage ../tools/misc/ffsend { - inherit (darwin.apple_sdk.frameworks) Security AppKit; - }; + ffsend = callPackage ../tools/misc/ffsend { }; flannel = callPackage ../tools/networking/flannel { }; cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix { }; @@ -3431,9 +3231,7 @@ with pkgs; hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { }; - libbtbb = callPackage ../development/libraries/libbtbb { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + libbtbb = callPackage ../development/libraries/libbtbb { }; lpd8editor = libsForQt5.callPackage ../applications/audio/lpd8editor { }; @@ -3445,9 +3243,7 @@ with pkgs; fox = callPackage ../development/libraries/fox { }; - fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; fpm = callPackage ../tools/package-management/fpm { }; @@ -3463,15 +3259,7 @@ with pkgs; wxGTK = wxGTK32; }; - freshfetch = callPackage ../tools/misc/freshfetch { - inherit (darwin.apple_sdk.frameworks) - AppKit - CoreFoundation - DiskArbitration - Foundation - IOKit - ; - }; + freshfetch = callPackage ../tools/misc/freshfetch { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; @@ -3485,7 +3273,7 @@ with pkgs; foundationdb = foundationdb73; - fuse-ext2 = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/fuse-ext2 { }; + fuse-ext2 = callPackage ../tools/filesystems/fuse-ext2 { }; fwknop = callPackage ../tools/security/fwknop { texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. @@ -3549,10 +3337,6 @@ with pkgs; gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; - globalplatform = callPackage ../by-name/gl/globalplatform/package.nix { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; - glogg = libsForQt5.callPackage ../tools/text/glogg { }; gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect { @@ -3602,9 +3386,7 @@ with pkgs; }; gnupg = gnupg24; - gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; gnuplot_qt = gnuplot.override { withQt = true; }; @@ -3662,9 +3444,7 @@ with pkgs; cudaSupport = true; }; - gptcommit = callPackage ../development/tools/gptcommit { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + gptcommit = callPackage ../development/tools/gptcommit { }; gpredict = callPackage ../applications/science/astronomy/gpredict { hamlib = hamlib_4; @@ -3680,22 +3460,15 @@ with pkgs; callPackage ../tools/misc/graylog/plugins.nix { graylogPackage = graylog-6_0; } ); - graphviz = callPackage ../tools/graphics/graphviz { - inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; - }; + graphviz = callPackage ../tools/graphics/graphviz { }; graphviz-nox = callPackage ../tools/graphics/graphviz { - inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; withXorg = false; }; - igrep = callPackage ../tools/text/igrep { - inherit (darwin.apple_sdk.frameworks) Security; - }; + igrep = callPackage ../tools/text/igrep { }; - ripgrep-all = callPackage ../tools/text/ripgrep-all { - inherit (darwin.apple_sdk.frameworks) Security; - }; + ripgrep-all = callPackage ../tools/text/ripgrep-all { }; grub2 = callPackage ../tools/misc/grub/default.nix { }; @@ -3741,18 +3514,9 @@ with pkgs; gzip = callPackage ../tools/compression/gzip { }; - plplot = callPackage ../development/libraries/plplot { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + plplot = callPackage ../development/libraries/plplot { }; - hashcat = callPackage ../tools/security/hashcat { - inherit (darwin.apple_sdk.frameworks) - Foundation - IOKit - Metal - OpenCL - ; - }; + hashcat = callPackage ../tools/security/hashcat { }; haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix @@ -3830,9 +3594,7 @@ with pkgs; html-proofer = callPackage ../tools/misc/html-proofer { }; - htmlq = callPackage ../development/tools/htmlq { - inherit (darwin.apple_sdk.frameworks) Security; - }; + htmlq = callPackage ../development/tools/htmlq { }; httpie = with python3Packages; toPythonApplication httpie; @@ -3854,9 +3616,7 @@ with pkgs; icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak; - ifwifi = callPackage ../tools/networking/ifwifi { - inherit (darwin.apple_sdk.frameworks) Security; - }; + ifwifi = callPackage ../tools/networking/ifwifi { }; inherit (callPackages ../tools/filesystems/irods rec { @@ -3897,11 +3657,9 @@ with pkgs; infisical = callPackage ../development/tools/infisical { }; - inform6 = darwin.apple_sdk_11_0.callPackage ../development/compilers/inform6 { }; + inform6 = callPackage ../development/compilers/inform6 { }; - innernet = callPackage ../tools/networking/innernet { - inherit (darwin.apple_sdk.frameworks) Security; - }; + innernet = callPackage ../tools/networking/innernet { }; input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { }; @@ -3924,9 +3682,7 @@ with pkgs; isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { }; isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { }; - isync = callPackage ../tools/networking/isync { - inherit (darwin.apple_sdk.frameworks) Security; - }; + isync = callPackage ../tools/networking/isync { }; jackett = callPackage ../servers/jackett { }; @@ -3949,9 +3705,7 @@ with pkgs; jl = haskellPackages.jl; - jless = callPackage ../development/tools/jless { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + jless = callPackage ../development/tools/jless { }; joplin = nodePackages.joplin; @@ -3988,39 +3742,15 @@ with pkgs; kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { }; - kakoune-lsp = callPackage ../by-name/ka/kakoune-lsp/package.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; + kbs2 = callPackage ../tools/security/kbs2 { }; - kbs2 = callPackage ../tools/security/kbs2 { - inherit (darwin.apple_sdk.frameworks) AppKit SystemConfiguration; - }; - - kdash = callPackage ../development/tools/kdash { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + kdash = callPackage ../development/tools/kdash { }; kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { }; keepkey-agent = with python3Packages; toPythonApplication keepkey-agent; - keybase = darwin.apple_sdk_11_0.callPackage ../tools/security/keybase { - # Reasoning for the inherited apple_sdk.frameworks: - # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox - # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 - # #cgo LDFLAGS: -framework AVFoundation -framework CoreFoundation -framework ImageIO -framework CoreMedia -framework Foundation -framework CoreGraphics -lobjc - # with the exception of CoreFoundation, due to the warning in https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/frameworks.nix#L25 - inherit (darwin.apple_sdk_11_0.frameworks) - AppKit - AVFoundation - AudioToolbox - ImageIO - CoreMedia - Foundation - CoreGraphics - MediaToolbox - ; - }; + keybase = callPackage ../tools/security/keybase { }; kbfs = callPackage ../tools/security/keybase/kbfs.nix { }; @@ -4081,15 +3811,11 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - lldpd = callPackage ../tools/networking/lldpd { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + lldpd = callPackage ../tools/networking/lldpd { }; llm = with python3Packages; toPythonApplication llm; - lnx = callPackage ../servers/search/lnx { - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; - }; + lnx = callPackage ../servers/search/lnx { }; loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { }; @@ -4116,9 +3842,7 @@ with pkgs; kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; - lagrange = callPackage ../applications/networking/browsers/lagrange { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + lagrange = callPackage ../applications/networking/browsers/lagrange { }; lagrange-tui = lagrange.override { enableTUI = true; }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; @@ -4140,13 +3864,10 @@ with pkgs; md2pdf = with python3Packages; toPythonApplication md2pdf; mdcat = callPackage ../tools/text/mdcat { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; inherit (python3Packages) ansi2html; }; - mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck { }; medfile = callPackage ../development/libraries/medfile { hdf5 = hdf5.override { usev110Api = true; }; @@ -4154,9 +3875,7 @@ with pkgs; mhonarc = perlPackages.MHonArc; - mujmap = callPackage ../applications/networking/mujmap { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mujmap = callPackage ../applications/networking/mujmap { }; mx-puppet-discord = callPackage ../servers/mx-puppet-discord { }; @@ -4229,9 +3948,7 @@ with pkgs; node2nix = nodePackages.node2nix; - oxigraph = callPackage ../servers/oxigraph { - inherit (darwin.apple_sdk.frameworks) IOKit Security; - }; + oxigraph = callPackage ../servers/oxigraph { }; kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd { }; @@ -4247,9 +3964,7 @@ with pkgs; ; lerna = lerna_8; - lethe = callPackage ../tools/security/lethe { - inherit (darwin.apple_sdk.frameworks) Security; - }; + lethe = callPackage ../tools/security/lethe { }; libhandy = callPackage ../development/libraries/libhandy { }; @@ -4326,7 +4041,6 @@ with pkgs; inherit ({ limesuite = callPackage ../applications/radio/limesuite { - inherit (darwin.apple_sdk.frameworks) GLUT; }; limesuiteWithGui = limesuite.override { withGui = true; @@ -4406,9 +4120,7 @@ with pkgs; molecule = with python3Packages; toPythonApplication molecule; - monolith = callPackage ../tools/backup/monolith { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + monolith = callPackage ../tools/backup/monolith { }; moreutils = callPackage ../tools/misc/moreutils { docbook-xsl = docbook_xsl; @@ -4416,9 +4128,7 @@ with pkgs; metasploit = callPackage ../tools/security/metasploit { }; - mhost = callPackage ../applications/networking/mhost { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + mhost = callPackage ../applications/networking/mhost { }; mtr = callPackage ../tools/networking/mtr { }; @@ -4516,7 +4226,6 @@ with pkgs; op-geth = callPackage ../applications/blockchains/optimism/geth.nix { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; }; optimism = callPackage ../applications/blockchains/optimism { }; @@ -4553,9 +4262,7 @@ with pkgs; protobuf = protobuf_21; }; - ntfs3g = callPackage ../tools/filesystems/ntfs-3g { - inherit (darwin.apple_sdk.frameworks) DiskArbitration; - }; + ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; @@ -4570,9 +4277,7 @@ with pkgs; nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { }; - octofetch = callPackage ../tools/misc/octofetch { - inherit (darwin.apple_sdk.frameworks) Security; - }; + octofetch = callPackage ../tools/misc/octofetch { }; ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; @@ -4580,9 +4285,7 @@ with pkgs; protobuf = protobuf_21; }; - olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; - }; + olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { }; ombi = callPackage ../servers/ombi { }; @@ -4596,9 +4299,7 @@ with pkgs; openboard = libsForQt5.callPackage ../applications/graphics/openboard { }; - opendht = callPackage ../development/libraries/opendht { - inherit (darwin.apple_sdk.frameworks) Security; - }; + opendht = callPackage ../development/libraries/opendht { }; ophcrack-cli = ophcrack.override { enableGui = false; }; @@ -4626,7 +4327,7 @@ with pkgs; openrgb-plugin-hardwaresync ]; - toastify = darwin.apple_sdk_11_0.callPackage ../tools/misc/toastify { }; + toastify = callPackage ../tools/misc/toastify { }; opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh { }); @@ -4707,9 +4408,7 @@ with pkgs; ossec-server = callPackage ../tools/security/ossec/server.nix { }; - ovito = qt6Packages.callPackage ../applications/graphics/ovito { - inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; - }; + ovito = qt6Packages.callPackage ../applications/graphics/ovito { }; p4c = callPackage ../development/compilers/p4c { protobuf = protobuf_21; @@ -4742,9 +4441,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - parrot = callPackage ../applications/audio/parrot { - inherit (darwin.apple_sdk.frameworks) Security; - }; + parrot = callPackage ../applications/audio/parrot { }; patchutils = callPackage ../tools/text/patchutils { }; @@ -4773,22 +4470,16 @@ with pkgs; patchance = python3Packages.callPackage ../applications/audio/patchance { }; - pciutils = callPackage ../tools/system/pciutils { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + pciutils = callPackage ../tools/system/pciutils { }; - pcsclite = callPackage ../tools/security/pcsclite { - inherit (darwin.apple_sdk.frameworks) Foundation IOKit; - }; + pcsclite = callPackage ../tools/security/pcsclite { }; pcscliteWithPolkit = pcsclite.override { pname = "pcsclite-with-polkit"; polkitSupport = true; }; - pcsc-tools = callPackage ../tools/security/pcsc-tools { - inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; - }; + pcsc-tools = callPackage ../tools/security/pcsc-tools { }; pdd = python3Packages.callPackage ../tools/misc/pdd { }; @@ -4828,22 +4519,11 @@ with pkgs; pinnwand = callPackage ../servers/pinnwand { }; - piping-server-rust = callPackage ../servers/piping-server-rust { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + piping-server-rust = callPackage ../servers/piping-server-rust { }; - pinyin-tool = callPackage ../tools/text/pinyin-tool { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pinyin-tool = callPackage ../tools/text/pinyin-tool { }; - plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port { - inherit (darwin.apple_sdk_11_0.frameworks) - Carbon - Cocoa - IOKit - Metal - QuartzCore - ; + plan9port = callPackage ../tools/system/plan9port { inherit (darwin) DarwinTools; }; @@ -4883,9 +4563,7 @@ with pkgs; python = null; }; - pngpaste = callPackage ../os-specific/darwin/pngpaste { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; - }; + pngpaste = callPackage ../os-specific/darwin/pngpaste { }; inherit (callPackage ../development/tools/pnpm { }) pnpm_8 @@ -4909,15 +4587,11 @@ with pkgs; projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { }; - proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit; - }; + proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { }; pws = callPackage ../tools/misc/pws { }; - pwninit = callPackage ../development/tools/misc/pwninit { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pwninit = callPackage ../development/tools/misc/pwninit { }; pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot; @@ -4929,7 +4603,7 @@ with pkgs; pypass = with python3Packages; toPythonApplication pypass; - py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy { }; + py-spy = callPackage ../development/tools/py-spy { }; pydeps = with python3Packages; toPythonApplication pydeps; @@ -4941,7 +4615,6 @@ with pkgs; riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn { provider = "riseup"; - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; @@ -4952,12 +4625,10 @@ with pkgs; rtaudio = callPackage ../development/libraries/audio/rtaudio { jack = libjack2; - inherit (darwin.apple_sdk.frameworks) CoreAudio; }; rtmidi = callPackage ../development/libraries/audio/rtmidi { jack = libjack2; - inherit (darwin.apple_sdk.frameworks) CoreMIDI CoreAudio CoreServices; }; mpi = openmpi; # this attribute should used to build MPI applications @@ -4965,9 +4636,7 @@ with pkgs; qarte = libsForQt5.callPackage ../applications/video/qarte { }; - qdrant = darwin.apple_sdk_11_0.callPackage ../servers/search/qdrant { - inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration; - }; + qdrant = callPackage ../servers/search/qdrant { }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; @@ -4991,9 +4660,7 @@ with pkgs; quictls = callPackage ../development/libraries/quictls { }; - quickwit = callPackage ../servers/search/quickwit { - inherit (darwin.apple_sdk.frameworks) Security; - }; + quickwit = callPackage ../servers/search/quickwit { }; quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota; @@ -5037,7 +4704,7 @@ with pkgs; recoll-nox = recoll.override { withGui = false; }; - remmina = darwin.apple_sdk_11_0.callPackage ../applications/networking/remote/remmina { }; + remmina = callPackage ../applications/networking/remote/remmina { }; reckon = callPackage ../tools/text/reckon { }; @@ -5059,11 +4726,7 @@ with pkgs; inherit (python3Packages) sphinx; }; - # Use `apple_sdk_11_0` because `apple_sdk.libs` does not provide `simd` - rnnoise-plugin = darwin.apple_sdk_11_0.callPackage ../development/libraries/rnnoise-plugin { - inherit (darwin.apple_sdk_11_0.frameworks) WebKit MetalKit CoreAudioKit; - inherit (darwin.apple_sdk_11_0.libs) simd; - }; + rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin { }; rosenpass = callPackage ../tools/networking/rosenpass { }; @@ -5083,43 +4746,29 @@ with pkgs; ruby-lsp = rubyPackages.ruby-lsp; - rust-motd = callPackage ../tools/misc/rust-motd { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rust-motd = callPackage ../tools/misc/rust-motd { }; - rustscan = callPackage ../tools/security/rustscan { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rustscan = callPackage ../tools/security/rustscan { }; - rustdesk-server = callPackage ../by-name/ru/rustdesk-server/package.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - s3fs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/s3fs { }; + s3fs = callPackage ../tools/filesystems/s3fs { }; s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; - s3rs = callPackage ../tools/networking/s3rs { - inherit (darwin.apple_sdk.frameworks) Security; - }; + s3rs = callPackage ../tools/networking/s3rs { }; s3-credentials = with python3Packages; toPythonApplication s3-credentials; safety-cli = with python3.pkgs; toPythonApplication safety; - saml2aws = callPackage ../tools/security/saml2aws { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + saml2aws = callPackage ../tools/security/saml2aws { }; sasview = libsForQt5.callPackage ../applications/science/misc/sasview { }; - screen = callPackage ../tools/misc/screen { - inherit (darwin.apple_sdk.libs) utmp; - }; + screen = callPackage ../tools/misc/screen { }; scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { }; - securefs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/securefs { }; + securefs = callPackage ../tools/filesystems/securefs { }; segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; }; @@ -5149,9 +4798,7 @@ with pkgs; conf = config.slstatus.conf or null; }; - smartmontools = callPackage ../tools/system/smartmontools { - inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; - }; + smartmontools = callPackage ../tools/system/smartmontools { }; smpq = callPackage ../by-name/sm/smpq/package.nix { stormlib = stormlib.overrideAttrs (old: { @@ -5165,8 +4812,7 @@ with pkgs; }); }; - snapcast = darwin.apple_sdk_11_0.callPackage ../applications/audio/snapcast { - inherit (darwin.apple_sdk_11_0.frameworks) IOKit AudioToolbox; + snapcast = callPackage ../applications/audio/snapcast { pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux; }; @@ -5188,7 +4834,6 @@ with pkgs; softhsm = callPackage ../tools/security/softhsm { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Security; }; soundkonverter = libsForQt5.soundkonverter; @@ -5212,7 +4857,7 @@ with pkgs; splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot; - squashfs-tools-ng = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/squashfs-tools-ng { }; + squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { }; sourcehut = callPackage ../applications/version-management/sourcehut { }; @@ -5253,9 +4898,7 @@ with pkgs; subzerod = with python3Packages; toPythonApplication subzerod; - suckit = callPackage ../tools/networking/suckit { - inherit (darwin.apple_sdk.frameworks) Security; - }; + suckit = callPackage ../tools/networking/suckit { }; system-config-printer = callPackage ../tools/misc/system-config-printer { autoreconfHook = buildPackages.autoreconfHook269; @@ -5270,9 +4913,7 @@ with pkgs; t = callPackage ../tools/misc/t { }; - tab-rs = callPackage ../tools/misc/tab-rs { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + tab-rs = callPackage ../tools/misc/tab-rs { }; tartube = callPackage ../applications/video/tartube { }; @@ -5280,15 +4921,12 @@ with pkgs; youtube-dl = yt-dlp; }; - tcpreplay = callPackage ../tools/networking/tcpreplay { - inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; - }; + tcpreplay = callPackage ../tools/networking/tcpreplay { }; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; inherit (callPackages ../servers/teleport { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; }) teleport_16 teleport_17 @@ -5337,9 +4975,7 @@ with pkgs; tldr-hs = haskellPackages.tldr; - tmux-sessionizer = callPackage ../tools/misc/tmux-sessionizer { - inherit (darwin.apple_sdk.frameworks) Security; - }; + tmux-sessionizer = callPackage ../tools/misc/tmux-sessionizer { }; tmuxPlugins = recurseIntoAttrs ( callPackage ../misc/tmux-plugins { @@ -5347,19 +4983,15 @@ with pkgs; } ); - tokei = callPackage ../development/tools/misc/tokei { - inherit (darwin.apple_sdk.frameworks) Security; - }; + tokei = callPackage ../development/tools/misc/tokei { }; - topgrade = callPackage ../tools/misc/topgrade { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; - }; + topgrade = callPackage ../tools/misc/topgrade { }; tor = callPackage ../tools/security/tor { }; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; - toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { }; + toybox = callPackage ../tools/misc/toybox { }; trackma-curses = trackma.override { withCurses = true; }; @@ -5371,16 +5003,10 @@ with pkgs; trezorctl = with python3Packages; toPythonApplication trezor; - trezord = callPackage ../servers/trezord { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + trezord = callPackage ../servers/trezord { }; trezor-agent = with python3Packages; toPythonApplication trezor-agent; - trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; - ttp = with python3.pkgs; toPythonApplication ttp; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; @@ -5407,13 +5033,9 @@ with pkgs; }; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; - tuifeed = callPackage ../applications/networking/feedreaders/tuifeed { - inherit (darwin.apple_sdk.frameworks) Security; - }; + tuifeed = callPackage ../applications/networking/feedreaders/tuifeed { }; - tunnelto = callPackage ../tools/networking/tunnelto { - inherit (darwin.apple_sdk.frameworks) Security; - }; + tunnelto = callPackage ../tools/networking/tunnelto { }; twilight = callPackage ../tools/graphics/twilight { libX11 = xorg.libX11; @@ -5486,17 +5108,11 @@ with pkgs; inherit (perlPackages) Po4a; }; - sentry-cli = callPackage ../development/tools/sentry-cli { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; + sentry-cli = callPackage ../development/tools/sentry-cli { }; - waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { - inherit (darwin.apple_sdk.frameworks) OpenCL; - }; + waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { }; - watchexec = callPackage ../tools/misc/watchexec { - inherit (darwin.apple_sdk.frameworks) Cocoa AppKit; - }; + watchexec = callPackage ../tools/misc/watchexec { }; webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1"; webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1"; @@ -5509,14 +5125,11 @@ with pkgs; wasmedge = callPackage ../development/tools/wasmedge { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv; - inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; whatweb = callPackage ../tools/security/whatweb { }; - wg-netmanager = callPackage ../tools/networking/wg-netmanager { - inherit (darwin.apple_sdk.frameworks) Security; - }; + wg-netmanager = callPackage ../tools/networking/wg-netmanager { }; woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { }; @@ -5532,9 +5145,7 @@ with pkgs; testdisk-qt = testdisk.override { enableQt = true; }; - htmldoc = callPackage ../tools/typesetting/htmldoc { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; - }; + htmldoc = callPackage ../tools/typesetting/htmldoc { }; td = callPackage ../tools/misc/td { }; @@ -5542,9 +5153,7 @@ with pkgs; tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; - tremor-rs = darwin.apple_sdk_11_0.callPackage ../tools/misc/tremor-rs { - inherit (darwin.apple_sdk_11_0.frameworks) Security; - }; + tremor-rs = callPackage ../tools/misc/tremor-rs { }; tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { }; @@ -5578,9 +5187,7 @@ with pkgs; withRedis = true; }; - unicorn = callPackage ../development/libraries/unicorn { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + unicorn = callPackage ../development/libraries/unicorn { }; unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; @@ -5593,7 +5200,6 @@ with pkgs; }; unar = callPackage ../tools/archivers/unar { - inherit (darwin.apple_sdk.frameworks) Foundation AppKit; stdenv = clangStdenv; }; @@ -5613,9 +5219,7 @@ with pkgs; varnishPackages = varnish75Packages; varnish = varnishPackages.varnish; - viceroy = callPackage ../development/tools/viceroy { - inherit (darwin.apple_sdk.frameworks) Security; - }; + viceroy = callPackage ../development/tools/viceroy { }; vncdo = with python3Packages; toPythonApplication vncdo; @@ -5626,9 +5230,7 @@ with pkgs; # https://github.com/NixOS/nixpkgs/issues/227327 wafHook = waf.hook; - wagyu = callPackage ../tools/misc/wagyu { - inherit (darwin.apple_sdk.frameworks) Security; - }; + wagyu = callPackage ../tools/misc/wagyu { }; web-eid-app = libsForQt5.callPackage ../tools/security/web-eid-app { }; @@ -5638,7 +5240,6 @@ with pkgs; wiiuse = callPackage ../development/libraries/wiiuse { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; }; wring = nodePackages.wring; @@ -5676,9 +5277,7 @@ with pkgs; w3m = w3m-batch; }; - xidlehook = callPackage ../tools/X11/xidlehook { - inherit (darwin.apple_sdk.frameworks) Security; - }; + xidlehook = callPackage ../tools/X11/xidlehook { }; xorriso = libisoburn; @@ -5709,17 +5308,13 @@ with pkgs; # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; - yaydl = callPackage ../tools/video/yaydl { - inherit (darwin.apple_sdk.frameworks) Security; - }; + yaydl = callPackage ../tools/video/yaydl { }; zbackup = callPackage ../tools/backup/zbackup { protobuf = protobuf_21; }; - zbar = libsForQt5.callPackage ../tools/graphics/zbar { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; # Nvidia support does not require any propietary libraries, so CI can build it. # Note that when enabling this unconditionally, non-nvidia users will always have an empty "GPU" section. @@ -5809,9 +5404,7 @@ with pkgs; stdenv = gcc10Stdenv; }; - autocorrect = callPackage ../tools/text/autocorrect { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + autocorrect = callPackage ../tools/text/autocorrect { }; ballerina = callPackage ../development/compilers/ballerina { openjdk = openjdk17_headless; @@ -5906,11 +5499,9 @@ with pkgs; corretto17 = javaPackages.compiler.corretto17; corretto21 = javaPackages.compiler.corretto21; - cotton = callPackage ../development/tools/cotton { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + cotton = callPackage ../development/tools/cotton { }; - inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) + inherit (callPackage ../development/compilers/crystal { }) crystal_1_11 crystal_1_14 crystal_1_15 @@ -6469,7 +6060,6 @@ with pkgs; inherit (callPackage ../development/compilers/haxe { - inherit (darwin.apple_sdk.frameworks) Security; }) haxe_4_3 haxe_4_1 @@ -6503,14 +6093,7 @@ with pkgs; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - iay = callPackage ../tools/misc/iay { - inherit (darwin.apple_sdk.frameworks) - AppKit - Security - Foundation - Cocoa - ; - }; + iay = callPackage ../tools/misc/iay { }; idrisPackages = dontRecurseIntoAttrs ( callPackage ../development/idris-modules { @@ -6630,7 +6213,7 @@ with pkgs; julia-stable-bin = julia_111-bin; julia-bin = julia-stable-bin; - kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; + kind2 = callPackage ../development/compilers/kind2 { }; koka = haskell.lib.compose.justStaticExecutables ( haskellPackages.callPackage ../development/compilers/koka { } @@ -6653,16 +6236,7 @@ with pkgs; withQt = true; }; - lobster = callPackage ../development/compilers/lobster { - inherit (darwin.apple_sdk.frameworks) - CoreFoundation - Cocoa - AudioToolbox - OpenGL - Foundation - ForceFeedback - ; - }; + lobster = callPackage ../development/compilers/lobster { }; lld = llvmPackages.lld; lld_12 = llvmPackages_12.lld; @@ -6753,9 +6327,7 @@ with pkgs; bolt_20 ; - lorri = callPackage ../tools/misc/lorri { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + lorri = callPackage ../tools/misc/lorri { }; mercury = callPackage ../development/compilers/mercury { jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -6784,18 +6356,15 @@ with pkgs; mono4 = lowPrio ( callPackage ../development/compilers/mono/4.nix { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; } ); mono5 = callPackage ../development/compilers/mono/5.nix { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; }; mono6 = callPackage ../development/compilers/mono/6.nix { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; }; mozart2 = callPackage ../development/compilers/mozart { @@ -6856,9 +6425,7 @@ with pkgs; ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml.nix { }; - opam = callPackage ../development/tools/ocaml/opam { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + opam = callPackage ../development/tools/ocaml/opam { }; opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { }; @@ -6875,17 +6442,13 @@ with pkgs; pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { }; - replibyte = callPackage ../development/tools/database/replibyte { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + replibyte = callPackage ../development/tools/database/replibyte { }; rml = callPackage ../development/compilers/rml { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - rtags = callPackage ../development/tools/rtags { - inherit (darwin) apple_sdk; - }; + rtags = callPackage ../development/tools/rtags { }; wrapRustcWith = { rustc-unwrapped, ... }@args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; @@ -6938,33 +6501,22 @@ with pkgs; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; cargo-flamegraph = callPackage ../development/tools/rust/cargo-flamegraph { - inherit (darwin.apple_sdk.frameworks) Security; inherit (linuxPackages) perf; }; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; - cargo-audit = callPackage ../development/tools/rust/cargo-audit { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - cargo-c = callPackage ../development/tools/rust/cargo-c { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; - cargo-clone = callPackage ../development/tools/rust/cargo-clone { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; + cargo-audit = callPackage ../development/tools/rust/cargo-audit { }; + cargo-c = callPackage ../development/tools/rust/cargo-c { }; + cargo-clone = callPackage ../development/tools/rust/cargo-clone { }; cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { rustPlatform = makeRustPlatform { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit rustc cargo; }; }; - cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; - }; - cargo-edit = callPackage ../development/tools/rust/cargo-edit { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx { }; + cargo-edit = callPackage ../development/tools/rust/cargo-edit { }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) cargo-pgrx_0_12_0_alpha_1 cargo-pgrx_0_12_5 @@ -6972,57 +6524,29 @@ with pkgs; ; cargo-pgrx = cargo-pgrx_0_12_6; - buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { - inherit (darwin.apple_sdk.frameworks) Security; - }; - cargo-bazel = callPackage ../development/tools/rust/cargo-bazel { - inherit (darwin.apple_sdk.frameworks) Security; - }; - cargo-crev = callPackage ../development/tools/rust/cargo-crev { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; - }; - cargo-fund = callPackage ../development/tools/rust/cargo-fund { - inherit (darwin.apple_sdk.frameworks) Security; - }; - cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - cargo-ndk = callPackage ../development/tools/rust/cargo-ndk { - inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation; - }; + buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix { }; + cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; + cargo-bazel = callPackage ../development/tools/rust/cargo-bazel { }; + cargo-crev = callPackage ../development/tools/rust/cargo-crev { }; + cargo-fund = callPackage ../development/tools/rust/cargo-fund { }; + cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { }; + cargo-ndk = callPackage ../development/tools/rust/cargo-ndk { }; - cargo-rdme = callPackage ../by-name/ca/cargo-rdme/package.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; + cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { }; cargo-vet = callPackage ../development/tools/rust/cargo-vet { }; - cargo-watch = callPackage ../development/tools/rust/cargo-watch { - inherit (darwin.apple_sdk.frameworks) Foundation Cocoa; - }; - cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-watch = callPackage ../development/tools/rust/cargo-watch { }; + cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures { }; opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { }; rustfmt = rustPackages.rustfmt; rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; - rust-cbindgen = callPackage ../development/tools/rust/cbindgen { - inherit (darwin.apple_sdk.frameworks) Security; - }; - rustup = callPackage ../development/tools/rust/rustup { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + rust-cbindgen = callPackage ../development/tools/rust/cbindgen { }; + rustup = callPackage ../development/tools/rust/rustup { }; rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { - inherit (darwin.apple_sdk.frameworks) Security; }; scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; }; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; @@ -7042,9 +6566,7 @@ with pkgs; inherit (darwin) Libsystem; }; - sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security; - }; + sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { }; squeak = callPackage ../development/compilers/squeak { stdenv = clangStdenv; @@ -7059,9 +6581,7 @@ with pkgs; ]; }; - surrealdb-migrations = callPackage ../development/tools/database/surrealdb-migrations { - inherit (darwin.apple_sdk.frameworks) Security; - }; + surrealdb-migrations = callPackage ../development/tools/database/surrealdb-migrations { }; swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { }); inherit (swiftPackages) @@ -7072,9 +6592,7 @@ with pkgs; swiftpm2nix ; - swi-prolog = callPackage ../development/compilers/swi-prolog { - inherit (darwin.apple_sdk.frameworks) Security; - }; + swi-prolog = callPackage ../development/compilers/swi-prolog { }; swi-prolog-gui = swi-prolog.override { withGui = true; }; tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { }; @@ -7085,7 +6603,6 @@ with pkgs; terra = callPackage ../development/compilers/terra { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; }; teyjus = callPackage ../development/compilers/teyjus { @@ -7096,7 +6613,7 @@ with pkgs; gconf = gnome2.GConf; }; - tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { }; + tinycc = callPackage ../development/compilers/tinycc { }; urweb = callPackage ../development/compilers/urweb { icu = icu67; @@ -7320,13 +6837,9 @@ with pkgs; dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { }); - duckscript = callPackage ../development/tools/rust/duckscript { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + duckscript = callPackage ../development/tools/rust/duckscript { }; - evcxr = callPackage ../development/interpreters/evcxr { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + evcxr = callPackage ../development/interpreters/evcxr { }; beam = callPackage ./beam-packages.nix { }; beam_minimal = callPackage ./beam-packages.nix { @@ -7377,14 +6890,11 @@ with pkgs; gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { inherit (llvmPackages) openmp; - inherit (darwin.apple_sdk.frameworks) Cocoa; # MPICH currently build on Darwin mpi = mpich; }; - graphql-client = callPackage ../development/tools/graphql-client { - inherit (darwin.apple_sdk.frameworks) Security; - }; + graphql-client = callPackage ../development/tools/graphql-client { }; inherit (callPackages ../applications/networking/cluster/hadoop { }) hadoop_3_4 @@ -7667,9 +7177,7 @@ with pkgs; }; rakudo = callPackage ../development/interpreters/rakudo { }; - moarvm = darwin.apple_sdk_11_0.callPackage ../development/interpreters/rakudo/moarvm.nix { - inherit (darwin.apple_sdk_11_0.frameworks) CoreServices ApplicationServices; - }; + moarvm = callPackage ../development/interpreters/rakudo/moarvm.nix { }; nqp = callPackage ../development/interpreters/rakudo/nqp.nix { }; zef = callPackage ../development/interpreters/rakudo/zef.nix { }; @@ -7680,7 +7188,6 @@ with pkgs; }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { inherit (darwin) DarwinTools autoSignDarwinBinariesHook; - inherit (darwin.apple_sdk.frameworks) CoreServices; }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; @@ -7690,15 +7197,13 @@ with pkgs; solargraph = rubyPackages.solargraph; - rubyfmt = darwin.apple_sdk_11_0.callPackage ../development/tools/rubyfmt { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; + rubyfmt = callPackage ../development/tools/rubyfmt { inherit (darwin) libobjc; }; inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libobjc libunwind; - inherit (darwin.apple_sdk.frameworks) Foundation; }) mkRubyVersion mkRuby @@ -7820,10 +7325,6 @@ with pkgs; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix { }; - mise = callPackage ../by-name/mi/mise/package.nix { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - ### DEVELOPMENT / TOOLS actiona = libsForQt5.callPackage ../applications/misc/actiona { }; @@ -8000,15 +7501,13 @@ with pkgs; buildozer = bazel-buildtools; unused_deps = bazel-buildtools; - buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { - inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { - inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; withAllTargets = true; @@ -8109,16 +7608,13 @@ with pkgs; bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { }; - bore-cli = callPackage ../tools/networking/bore-cli/default.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + bore-cli = callPackage ../tools/networking/bore-cli/default.nix { }; bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; buildkite-test-collector-rust = callPackage ../development/tools/continuous-integration/buildkite-test-collector-rust { - inherit (darwin.apple_sdk.frameworks) Security; }; libbpf = callPackage ../os-specific/linux/libbpf { }; @@ -8314,18 +7810,15 @@ with pkgs; dot2tex = with python3.pkgs; toPythonApplication dot2tex; - doxygen = darwin.apple_sdk_11_0.callPackage ../development/tools/documentation/doxygen { + doxygen = callPackage ../development/tools/documentation/doxygen { qt5 = null; - inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; doxygen_gui = lowPrio (doxygen.override { inherit qt5; }); drake = callPackage ../development/tools/build-managers/drake { }; - dura = callPackage ../development/tools/misc/dura { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dura = callPackage ../development/tools/misc/dura { }; edb = libsForQt5.callPackage ../development/tools/misc/edb { }; @@ -8337,7 +7830,6 @@ with pkgs; ); flow = callPackage ../development/tools/analysis/flow { - inherit (darwin.apple_sdk.frameworks) CoreServices; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -8351,13 +7843,10 @@ with pkgs; }; fswatch = callPackage ../development/tools/misc/fswatch { - inherit (darwin.apple_sdk.frameworks) CoreServices; autoreconfHook = buildPackages.autoreconfHook269; }; - fujprog = callPackage ../development/embedded/fpga/fujprog { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + fujprog = callPackage ../development/embedded/fpga/fujprog { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; @@ -8446,9 +7935,7 @@ with pkgs; kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; - kubie = callPackage ../development/tools/kubie { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubie = callPackage ../development/tools/kubie { }; kustomize = callPackage ../development/tools/kustomize { }; @@ -8465,13 +7952,10 @@ with pkgs; libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { }; linuxkit = callPackage ../development/tools/misc/linuxkit { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa Virtualization; inherit (darwin) sigtool; }; - listenbrainz-mpd = callPackage ../applications/audio/listenbrainz-mpd { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; - }; + listenbrainz-mpd = callPackage ../applications/audio/listenbrainz-mpd { }; lit = with python3Packages; toPythonApplication lit; @@ -8495,9 +7979,7 @@ with pkgs; ); minizinc = callPackage ../development/tools/minizinc { }; - minizincide = qt6Packages.callPackage ../development/tools/minizinc/ide.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; - }; + minizincide = qt6Packages.callPackage ../development/tools/minizinc/ide.nix { }; mkdocs = with python3Packages; toPythonApplication mkdocs; @@ -8571,9 +8053,7 @@ with pkgs; libiberty_static = libiberty.override { staticBuild = true; }; }; - pactorio = callPackage ../development/tools/pactorio { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pactorio = callPackage ../development/tools/pactorio { }; patchelf = callPackage ../development/tools/misc/patchelf { }; @@ -8612,9 +8092,7 @@ with pkgs; premake4 = callPackage ../development/tools/misc/premake { }; - premake5 = callPackage ../development/tools/misc/premake/5.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + premake5 = callPackage ../development/tools/misc/premake/5.nix { }; premake = premake4; @@ -8687,9 +8165,7 @@ with pkgs; scss-lint = callPackage ../development/tools/scss-lint { }; - shadowenv = callPackage ../tools/misc/shadowenv { - inherit (darwin.apple_sdk.frameworks) Security; - }; + shadowenv = callPackage ../tools/misc/shadowenv { }; shake = # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 @@ -8710,17 +8186,6 @@ with pkgs; # pandoc takes long to build and documentation isn't needed for just running the cli shellcheck-minimal = haskell.lib.compose.justStaticExecutables shellcheck.unwrapped; - slint-lsp = callPackage ../by-name/sl/slint-lsp/package.nix { - inherit (darwin.apple_sdk_11_0.frameworks) - AppKit - CoreGraphics - CoreServices - CoreText - Foundation - OpenGL - ; - }; - sloc = nodePackages.sloc; slurm = callPackage ../by-name/sl/slurm/package.nix { @@ -8748,9 +8213,7 @@ with pkgs; protobuf = protobuf_21; }; - spr = callPackage ../development/tools/spr { - inherit (darwin.apple_sdk.frameworks) Security; - }; + spr = callPackage ../development/tools/spr { }; sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; @@ -8787,9 +8250,7 @@ with pkgs; texinfo = texinfo7; texinfoInteractive = texinfo.override { interactive = true; }; - texlab = callPackage ../development/tools/misc/texlab { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; - }; + texlab = callPackage ../development/tools/misc/texlab { }; tflint-plugins = recurseIntoAttrs (callPackage ../development/tools/analysis/tflint-plugins { }); @@ -8841,9 +8302,7 @@ with pkgs; watson-ruby = callPackage ../development/tools/misc/watson-ruby { }; - xmake = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/xmake { - inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; - }; + xmake = callPackage ../development/tools/build-managers/xmake { }; xcbuild = callPackage ../by-name/xc/xcbuild/package.nix { stdenv = @@ -8863,7 +8322,6 @@ with pkgs; xxdiff-tip = xxdiff; ycmd = callPackage ../by-name/yc/ycmd/package.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; python = python3; }; @@ -8935,9 +8393,7 @@ with pkgs; argparse-manpage = with python3Packages; toPythonApplication argparse-manpage; - aribb25 = callPackage ../development/libraries/aribb25 { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; + aribb25 = callPackage ../development/libraries/aribb25 { }; arrayfire = callPackage ../development/libraries/arrayfire { }; @@ -8961,21 +8417,13 @@ with pkgs; aqbanking = callPackage ../development/libraries/aqbanking { }; - audiofile = callPackage ../development/libraries/audiofile { - inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; - }; + audiofile = callPackage ../development/libraries/audiofile { }; - aws-c-cal = callPackage ../development/libraries/aws-c-cal { - inherit (darwin.apple_sdk.frameworks) Security; - }; + aws-c-cal = callPackage ../development/libraries/aws-c-cal { }; - aws-c-io = callPackage ../development/libraries/aws-c-io { - inherit (darwin.apple_sdk.frameworks) Security; - }; + aws-c-io = callPackage ../development/libraries/aws-c-io { }; - aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { - inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; - }; + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { }; aws-spend-summary = haskellPackages.aws-spend-summary.bin; @@ -9014,14 +8462,7 @@ with pkgs; botan3 ; - box2d = callPackage ../development/libraries/box2d { - inherit (darwin.apple_sdk.frameworks) - Carbon - Cocoa - Kernel - OpenGL - ; - }; + box2d = callPackage ../development/libraries/box2d { }; c-ares = callPackage ../development/libraries/c-ares { }; @@ -9040,9 +8481,7 @@ with pkgs; }; }); - cubeb = callPackage ../development/libraries/audio/cubeb { - inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreServices; - }; + cubeb = callPackage ../development/libraries/audio/cubeb { }; hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; @@ -9063,9 +8502,7 @@ with pkgs; tbb = tbb_2021_11; }; - cctz = callPackage ../development/libraries/cctz { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + cctz = callPackage ../development/libraries/cctz { }; ceedling = callPackage ../development/tools/ceedling { }; @@ -9083,24 +8520,19 @@ with pkgs; ] ); - check = callPackage ../development/libraries/check { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + check = callPackage ../development/libraries/check { }; clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; clucene_core = clucene_core_2; - clutter-gst = callPackage ../development/libraries/clutter-gst { - }; + clutter-gst = callPackage ../development/libraries/clutter-gst { }; codecserver = callPackage ../applications/audio/codecserver { protobuf = protobuf_21; }; - cogl = callPackage ../development/libraries/cogl { - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; + cogl = callPackage ../development/libraries/cogl { }; inherit (cosmopolitan) cosmocc; @@ -9151,9 +8583,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - discord-rpc = callPackage ../development/libraries/discord-rpc { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + discord-rpc = callPackage ../development/libraries/discord-rpc { }; draco = callPackage ../development/libraries/draco { tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { }; @@ -9184,20 +8614,14 @@ with pkgs; vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; - vmmlib = callPackage ../development/libraries/vmmlib { - inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; - }; + vmmlib = callPackage ../development/libraries/vmmlib { }; - elastix = callPackage ../development/libraries/science/biology/elastix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + elastix = callPackage ../development/libraries/science/biology/elastix { }; # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013 emanote = haskellPackages.emanote; - enchant2 = callPackage ../development/libraries/enchant/2.x.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; enchant = enchant2; libepoxy = callPackage ../development/libraries/libepoxy { }; @@ -9214,16 +8638,7 @@ with pkgs; factor-lang-0_100 = factorPackages-0_100.factor-lang; factor-lang = factor-lang-0_100; - far2l = callPackage ../applications/misc/far2l { - inherit (darwin.apple_sdk.frameworks) - IOKit - Carbon - Cocoa - AudioToolbox - OpenGL - System - ; - }; + far2l = callPackage ../applications/misc/far2l { }; farstream = callPackage ../development/libraries/farstream { inherit (gst_all_1) @@ -9265,22 +8680,8 @@ with pkgs; flint3 = callPackage ../development/libraries/flint/3.nix { }; - fltk13 = callPackage ../development/libraries/fltk { - inherit (darwin.apple_sdk.frameworks) - ApplicationServices - Carbon - Cocoa - OpenGL - ; - }; - fltk14 = callPackage ../development/libraries/fltk/1.4.nix { - inherit (darwin.apple_sdk.frameworks) - ApplicationServices - Carbon - Cocoa - OpenGL - ; - }; + fltk13 = callPackage ../development/libraries/fltk { }; + fltk14 = callPackage ../development/libraries/fltk/1.4.nix { }; fltk13-minimal = fltk13.override { withGL = false; withCairo = false; @@ -9322,17 +8723,13 @@ with pkgs; frog = res.languageMachines.frog; - fontconfig = callPackage ../development/libraries/fontconfig { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; - }; + fontconfig = callPackage ../development/libraries/fontconfig { }; makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { }; makeFontsCache = callPackage ../development/libraries/fontconfig/make-fonts-cache.nix { }; - freenect = callPackage ../development/libraries/freenect { - inherit (darwin.apple_sdk.frameworks) Cocoa GLUT; - }; + freenect = callPackage ../development/libraries/freenect { }; gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { protobuf = protobuf_21; @@ -9351,11 +8748,10 @@ with pkgs; geph = recurseIntoAttrs (callPackages ../applications/networking/geph { pnpm = pnpm_8; }); gegl = callPackage ../development/libraries/gegl { - inherit (darwin.apple_sdk.frameworks) OpenCL; openexr = openexr_2; }; - gensio = darwin.apple_sdk_11_0.callPackage ../development/libraries/gensio { }; + gensio = callPackage ../development/libraries/gensio { }; geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; }; @@ -9395,16 +8791,10 @@ with pkgs; graphia = qt6Packages.callPackage ../applications/science/misc/graphia { }; - libgit2 = callPackage ../development/libraries/libgit2 { - inherit (darwin.apple_sdk.frameworks) Security; - }; + libgit2 = callPackage ../development/libraries/libgit2 { }; - glew = callPackage ../development/libraries/glew { - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; - glew110 = callPackage ../development/libraries/glew/1.10.nix { - inherit (darwin.apple_sdk.frameworks) AGL OpenGL; - }; + glew = callPackage ../development/libraries/glew { }; + glew110 = callPackage ../development/libraries/glew/1.10.nix { }; glfw = glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; @@ -9596,7 +8986,6 @@ with pkgs; qxmpp = qt6Packages.callPackage ../development/libraries/qxmpp { }; gnutls = callPackage ../development/libraries/gnutls { - inherit (darwin.apple_sdk.frameworks) Security; util-linux = util-linuxMinimal; # break the cyclic dependency autoconf = buildPackages.autoconf269; }; @@ -9620,9 +9009,7 @@ with pkgs; glibmm = callPackage ../development/libraries/glibmm { }; - glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix { }; glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc; @@ -9635,37 +9022,25 @@ with pkgs; cairomm = callPackage ../development/libraries/cairomm { }; - cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { }; pango = callPackage ../development/libraries/pango { harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; }; }; - pangolin = callPackage ../development/libraries/pangolin { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; + pangolin = callPackage ../development/libraries/pangolin { }; - pangomm = callPackage ../development/libraries/pangomm { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + pangomm = callPackage ../development/libraries/pangomm { }; - pangomm_2_48 = callPackage ../development/libraries/pangomm/2.48.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + pangomm_2_48 = callPackage ../development/libraries/pangomm/2.48.nix { }; - pangomm_2_42 = callPackage ../development/libraries/pangomm/2.42.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + pangomm_2_42 = callPackage ../development/libraries/pangomm/2.42.nix { }; gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { }; - gtk2 = callPackage ../development/libraries/gtk/2.x.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; - }; + gtk2 = callPackage ../development/libraries/gtk/2.x.nix { }; gtk2-x11 = gtk2.override { cairo = cairo.override { x11Support = true; }; @@ -9676,9 +9051,7 @@ with pkgs; gdktarget = "x11"; }; - gtk3 = callPackage ../development/libraries/gtk/3.x.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa QuartzCore; - }; + gtk3 = callPackage ../development/libraries/gtk/3.x.nix { }; gtk4 = callPackage ../development/libraries/gtk/4.x.nix { }; @@ -9733,13 +9106,10 @@ with pkgs; hamlib_4 = callPackage ../development/libraries/hamlib/4.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; autoreconfHook = buildPackages.autoreconfHook269; }; - harfbuzz = callPackage ../development/libraries/harfbuzz { - inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText; - }; + harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzzFull = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; @@ -9749,9 +9119,7 @@ with pkgs; herqq = libsForQt5.callPackage ../development/libraries/herqq { }; - hidapi = callPackage ../development/libraries/hidapi { - inherit (darwin.apple_sdk.frameworks) Cocoa IOKit; - }; + hidapi = callPackage ../development/libraries/hidapi { }; highfive-mpi = highfive.override { hdf5 = hdf5-mpi; }; @@ -9825,7 +9193,7 @@ with pkgs; callPackage ../development/libraries/indicator-application/gtk3.nix { }; - indilib = darwin.apple_sdk_11_0.callPackage ../development/libraries/science/astronomy/indilib { }; + indilib = callPackage ../development/libraries/science/astronomy/indilib { }; indi-3rdparty = recurseIntoAttrs ( callPackages ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { } ); @@ -9837,7 +9205,6 @@ with pkgs; callPackage ../development/libraries/irrlicht { } else callPackage ../development/libraries/irrlicht/mac.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit; }; iso-flags-png-320x240 = iso-flags.overrideAttrs (oldAttrs: { @@ -9858,13 +9225,10 @@ with pkgs; }; itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; enableRtk = false; }; - itk_5 = callPackage ../development/libraries/itk/5.x.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + itk_5 = callPackage ../development/libraries/itk/5.x.nix { }; itk = itk_5; @@ -9908,35 +9272,21 @@ with pkgs; lcms = lcms2; - libacr38u = callPackage ../tools/security/libacr38u { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + libacr38u = callPackage ../tools/security/libacr38u { }; - libadwaita = callPackage ../development/libraries/libadwaita { - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation; - }; + libadwaita = callPackage ../development/libraries/libadwaita { }; libagar = callPackage ../development/libraries/libagar { }; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; libao = callPackage ../development/libraries/libao { usePulseAudio = config.pulseaudio or (lib.meta.availableOn stdenv.hostPlatform libpulseaudio); - inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { }; - libaribcaption = callPackage ../by-name/li/libaribcaption/package.nix { - inherit (darwin.apple_sdk.frameworks) - ApplicationServices - CoreFoundation - CoreGraphics - CoreText - ; - }; - libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { }; libbap = callPackage ../development/libraries/libbap { @@ -9954,15 +9304,11 @@ with pkgs; libbassmidi = (callPackage ../development/libraries/audio/libbass { }).bassmidi; libbassmix = (callPackage ../development/libraries/audio/libbass { }).bassmix; - libbluray = callPackage ../development/libraries/libbluray { - inherit (darwin.apple_sdk.frameworks) DiskArbitration; - }; + libbluray = callPackage ../development/libraries/libbluray { }; libcamera-qcam = callPackage ../by-name/li/libcamera/package.nix { withQcam = true; }; - libcanberra = callPackage ../development/libraries/libcanberra { - inherit (darwin.apple_sdk.frameworks) Carbon CoreServices AppKit; - }; + libcanberra = callPackage ../development/libraries/libcanberra { }; libcanberra-gtk2 = pkgs.libcanberra.override { gtkSupport = "gtk2"; }; @@ -9982,9 +9328,7 @@ with pkgs; libcef = callPackage ../development/libraries/libcef { }; - libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { - inherit (darwin.apple_sdk.frameworks) DiskArbitration IOKit; - }; + libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { }; libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; @@ -10010,26 +9354,19 @@ with pkgs; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; }; - libdc1394 = callPackage ../development/libraries/libdc1394 { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + libdc1394 = callPackage ../development/libraries/libdc1394 { }; - libdeflate = darwin.apple_sdk_11_0.callPackage ../development/libraries/libdeflate { }; + libdeflate = callPackage ../development/libraries/libdeflate { }; - libdevil = callPackage ../development/libraries/libdevil { - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; + libdevil = callPackage ../development/libraries/libdevil { }; libdevil-nox = callPackage ../development/libraries/libdevil { - inherit (darwin.apple_sdk.frameworks) OpenGL; withXorg = false; }; libdnf = callPackage ../tools/package-management/libdnf { python = python3; }; - libdvdcss = callPackage ../development/libraries/libdvdcss { - inherit (darwin) IOKit; - }; + libdvdcss = callPackage ../development/libraries/libdvdcss { }; libdvdnav = callPackage ../development/libraries/libdvdnav { }; libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix { @@ -10041,9 +9378,7 @@ with pkgs; dwarfdump = libdwarf.bin; - libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { - inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; - }; + libfilezilla = callPackage ../development/libraries/libfilezilla { }; libfm-extra = libfm.override { extraOnly = true; @@ -10059,13 +9394,10 @@ with pkgs; { }; libiio = callPackage ../development/libraries/libiio { - inherit (darwin.apple_sdk.frameworks) CFNetwork CoreServices; python = python3; }; - libsoundio = callPackage ../development/libraries/libsoundio { - inherit (darwin.apple_sdk.frameworks) AudioUnit; - }; + libsoundio = callPackage ../development/libraries/libsoundio { }; libextractor = callPackage ../development/libraries/libextractor { libmpeg2 = mpeg2dec; @@ -10089,12 +9421,9 @@ with pkgs; libftdi = callPackage ../development/libraries/libftdi { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit Security; }; - libgdiplus = callPackage ../development/libraries/libgdiplus { - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + libgdiplus = callPackage ../development/libraries/libgdiplus { }; # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118 libgpg-error-gen-posix-lock-obj = libgpg-error.override { @@ -10105,22 +9434,16 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - libimobiledevice = callPackage ../development/libraries/libimobiledevice { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation; - }; + libimobiledevice = callPackage ../development/libraries/libimobiledevice { }; libindicator-gtk2 = libindicator.override { gtkVersion = "2"; }; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; - libiodbc = callPackage ../development/libraries/libiodbc { - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + libiodbc = callPackage ../development/libraries/libiodbc { }; inherit (callPackage ../development/libraries/libliftoff { }) libliftoff_0_4 libliftoff_0_5; libliftoff = libliftoff_0_5; - liblqr1 = callPackage ../development/libraries/liblqr-1 { - inherit (darwin.apple_sdk.frameworks) Carbon AppKit; - }; + liblqr1 = callPackage ../development/libraries/liblqr-1 { }; libqtdbusmock = libsForQt5.callPackage ../development/libraries/libqtdbusmock { inherit (lomiri) cmake-extras; @@ -10130,9 +9453,7 @@ with pkgs; inherit (lomiri) cmake-extras; }; - libre = callPackage ../development/libraries/libre { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - }; + libre = callPackage ../development/libraries/libre { }; libremines = qt6.callPackage ../games/libremines { }; @@ -10232,9 +9553,7 @@ with pkgs; libmicrohttpd = libmicrohttpd_1_0; - libmikmod = callPackage ../development/libraries/libmikmod { - inherit (darwin.apple_sdk.frameworks) CoreAudio; - }; + libmikmod = callPackage ../development/libraries/libmikmod { }; libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { }; @@ -10247,9 +9566,7 @@ with pkgs; libpeas = callPackage ../development/libraries/libpeas { }; libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { }; - libphonenumber = callPackage ../development/libraries/libphonenumber { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + libphonenumber = callPackage ../development/libraries/libphonenumber { }; libpng = callPackage ../development/libraries/libpng { stdenv = @@ -10276,25 +9593,19 @@ with pkgs; python = python3; }; - librsvg = callPackage ../development/libraries/librsvg { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + librsvg = callPackage ../development/libraries/librsvg { }; libsigcxx = callPackage ../development/libraries/libsigcxx { }; libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { }; - libsndfile = callPackage ../development/libraries/libsndfile { - inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; - }; + libsndfile = callPackage ../development/libraries/libsndfile { }; libsoup_2_4 = callPackage ../development/libraries/libsoup { }; libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { }; - libstatgrab = callPackage ../development/libraries/libstatgrab { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + libstatgrab = callPackage ../development/libraries/libstatgrab { }; libticalcs2 = callPackage ../development/libraries/libticalcs2 { inherit (darwin) libobjc; @@ -10316,13 +9627,9 @@ with pkgs; ustream-ssl = ustream-ssl-mbedtls; }; - libui = callPackage ../development/libraries/libui { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + libui = callPackage ../development/libraries/libui { }; - libuiohook = callPackage ../development/libraries/libuiohook { - inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices Carbon; - }; + libuiohook = callPackage ../development/libraries/libuiohook { }; libunistring = callPackage ../development/libraries/libunistring { }; @@ -10333,7 +9640,6 @@ with pkgs; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit Security; }; libunicode = callPackage ../by-name/li/libunicode/package.nix { @@ -10351,7 +9657,7 @@ with pkgs; else callPackage ../development/libraries/libunwind { }; - libuv = darwin.apple_sdk_11_0.callPackage ../development/libraries/libuv { }; + libuv = callPackage ../development/libraries/libuv { }; libv4l = lowPrio ( v4l-utils.override { @@ -10366,17 +9672,11 @@ with pkgs; libva1 = callPackage ../development/libraries/libva/1.nix { }; libva1-minimal = libva1.override { minimal = true; }; - libvgm = callPackage ../development/libraries/libvgm { - inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; - }; + libvgm = callPackage ../development/libraries/libvgm { }; - libvirt = callPackage ../development/libraries/libvirt { - inherit (darwin.apple_sdk.frameworks) Carbon AppKit; - }; + libvirt = callPackage ../development/libraries/libvirt { }; - libvncserver = callPackage ../development/libraries/libvncserver { - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + libvncserver = callPackage ../development/libraries/libvncserver { }; libwnck = callPackage ../development/libraries/libwnck { }; libwnck2 = callPackage ../development/libraries/libwnck/2.nix { }; @@ -10521,8 +9821,7 @@ with pkgs; mesa = if stdenv.hostPlatform.isDarwin then - darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/darwin.nix { - inherit (darwin.apple_sdk_11_0.libs) Xplugin; + callPackage ../development/libraries/mesa/darwin.nix { } else callPackage ../development/libraries/mesa { }; @@ -10534,23 +9833,13 @@ with pkgs; ## End libGL/libGLU/Mesa stuff - midivisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midivisualizer { - inherit (darwin.apple_sdk_11_0.frameworks) - AppKit - Cocoa - Carbon - CoreAudio - CoreMIDI - CoreServices - Kernel - ; - }; + midivisualizer = callPackage ../applications/audio/midivisualizer { }; mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; }; - mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { }; + mlt = callPackage ../development/libraries/mlt { }; mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; @@ -10569,9 +9858,7 @@ with pkgs; mygpoclient = with python3.pkgs; toPythonApplication mygpoclient; - mygui = callPackage ../development/libraries/mygui { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + mygui = callPackage ../development/libraries/mygui { }; nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { }; @@ -10596,9 +9883,7 @@ with pkgs; libnghttp2 = nghttp2.lib; - nghttp3 = callPackage ../development/libraries/nghttp3 { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + nghttp3 = callPackage ../development/libraries/nghttp3 { }; ngtcp2 = callPackage ../development/libraries/ngtcp2 { }; ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { }; @@ -10607,9 +9892,7 @@ with pkgs; wafHook = (waf.override { extraTools = [ "gccdeps" ]; }).hook; }; - nspr = callPackage ../development/libraries/nspr { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + nspr = callPackage ../development/libraries/nspr { }; nss_latest = callPackage ../development/libraries/nss/latest.nix { }; nss_esr = callPackage ../development/libraries/nss/esr.nix { }; @@ -10643,9 +9926,7 @@ with pkgs; ogre = ogre_14; - openalSoft = callPackage ../development/libraries/openal-soft { - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; - }; + openalSoft = callPackage ../development/libraries/openal-soft { }; openal = openalSoft; openbabel = openbabel3; @@ -10687,7 +9968,6 @@ with pkgs; opencsg = callPackage ../development/libraries/opencsg { inherit (qt5) qmake; - inherit (darwin.apple_sdk.frameworks) GLUT; }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { @@ -10707,24 +9987,12 @@ with pkgs; openexr = callPackage ../development/libraries/openexr/3.nix { }; openexr_2 = callPackage ../development/libraries/openexr/2.nix { }; - opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { - inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; - }; + opencolorio = callPackage ../development/libraries/opencolorio { }; opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; - ois = callPackage ../development/libraries/ois { - inherit (darwin.apple_sdk.frameworks) Cocoa IOKit Kernel; - }; + ois = callPackage ../development/libraries/ois { }; - openscenegraph = callPackage ../development/libraries/openscenegraph { - inherit (darwin.apple_sdk.frameworks) - AGL - Accelerate - Carbon - Cocoa - Foundation - ; - }; + openscenegraph = callPackage ../development/libraries/openscenegraph { }; openstackclient = with python312Packages; toPythonApplication python-openstackclient; openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: { @@ -10745,10 +10013,6 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb { }; openvdb_11 = callPackage ../development/libraries/openvdb/11.nix { }; - openvr = callPackage ../by-name/op/openvr/package.nix { - inherit (darwin.apple_sdk.frameworks) Foundation AppKit; - }; - inherit (callPackages ../development/libraries/libressl { }) libressl_3_6 libressl_3_7 @@ -10759,9 +10023,7 @@ with pkgs; libressl = libressl_4_0; - wolfssl = darwin.apple_sdk_11_0.callPackage ../development/libraries/wolfssl { - inherit (darwin.apple_sdk_11_0.frameworks) Security; - }; + wolfssl = callPackage ../development/libraries/wolfssl { }; openssl = openssl_3_4; @@ -10794,13 +10056,10 @@ with pkgs; pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { }; - phetch = callPackage ../applications/networking/gopher/phetch { - inherit (darwin.apple_sdk.frameworks) Security; - }; + phetch = callPackage ../applications/networking/gopher/phetch { }; inherit (callPackage ../development/libraries/physfs { - inherit (darwin.apple_sdk.frameworks) Foundation; }) physfs_2 physfs @@ -10838,15 +10097,7 @@ with pkgs; utils = true; }; - portmidi = callPackage ../development/libraries/portmidi { - inherit (darwin.apple_sdk.frameworks) - Carbon - CoreAudio - CoreFoundation - CoreMIDI - CoreServices - ; - }; + portmidi = callPackage ../development/libraries/portmidi { }; proj = callPackage ../development/libraries/proj { }; @@ -10982,9 +10233,7 @@ with pkgs; } ); - quill = callPackage ../tools/security/quill { - inherit (darwin.apple_sdk.frameworks) Security; - }; + quill = callPackage ../tools/security/quill { }; qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray { }; @@ -11029,11 +10278,9 @@ with pkgs; useQt6 = true; }; - randomx = darwin.apple_sdk_11_0.callPackage ../development/libraries/randomx { }; + randomx = callPackage ../development/libraries/randomx { }; - remodel = callPackage ../development/tools/remodel { - inherit (darwin.apple_sdk.frameworks) Security; - }; + remodel = callPackage ../development/tools/remodel { }; reposilitePlugins = recurseIntoAttrs (callPackage ../by-name/re/reposilite/plugins.nix { }); @@ -11097,22 +10344,9 @@ with pkgs; SDL = SDL_compat; SDL2 = sdl2-compat; - SDL2_classic = callPackage ../by-name/sd/SDL2_classic/package.nix { - inherit (darwin.apple_sdk.frameworks) - AudioUnit - Cocoa - CoreAudio - CoreServices - ForceFeedback - OpenGL - ; - }; - sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { }; - sdrpp = callPackage ../applications/radio/sdrpp { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + sdrpp = callPackage ../applications/radio/sdrpp { }; sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { }; @@ -11123,7 +10357,6 @@ with pkgs; simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; avrlibc = pkgsCross.avr.libcCross; - inherit (darwin.apple_sdk.frameworks) GLUT; }; simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; }; @@ -11163,21 +10396,16 @@ with pkgs; soapyairspy = callPackage ../applications/radio/soapyairspy { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit Security; }; - soapyaudio = callPackage ../applications/radio/soapyaudio { - inherit (darwin.apple_sdk.frameworks) Accelerate CoreAudio; - }; + soapyaudio = callPackage ../applications/radio/soapyaudio { }; soapybladerf = callPackage ../applications/radio/soapybladerf { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit Security; }; soapyhackrf = callPackage ../applications/radio/soapyhackrf { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit Security; }; soapysdr = callPackage ../applications/radio/soapysdr { }; @@ -11198,21 +10426,15 @@ with pkgs; soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit Security; }; soapyuhd = callPackage ../applications/radio/soapyuhd { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit Security; }; - sofia_sip = callPackage ../development/libraries/sofia-sip { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - }; + sofia_sip = callPackage ../development/libraries/sofia-sip { }; - soil = callPackage ../development/libraries/soil { - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + soil = callPackage ../development/libraries/soil { }; spandsp = callPackage ../development/libraries/spandsp { }; spandsp3 = callPackage ../development/libraries/spandsp/3.nix { }; @@ -11228,9 +10450,7 @@ with pkgs; libsOnly = true; }; - speech-tools = callPackage ../development/libraries/speech-tools { - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; - }; + speech-tools = callPackage ../development/libraries/speech-tools { }; speex = callPackage ../development/libraries/speex { fftw = fftwFloat; @@ -11256,7 +10476,6 @@ with pkgs; inherit (callPackage ../development/libraries/sqlite/tools.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; }) sqlite-analyzer sqldiff @@ -11273,7 +10492,7 @@ with pkgs; structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { }; - suil = darwin.apple_sdk_11_0.callPackage ../development/libraries/audio/suil { }; + suil = callPackage ../development/libraries/audio/suil { }; sundials = callPackage ../development/libraries/sundials { python = python3; @@ -11281,9 +10500,7 @@ with pkgs; svxlink = libsForQt5.callPackage ../applications/radio/svxlink { }; - tachyon = callPackage ../development/libraries/tachyon { - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + tachyon = callPackage ../development/libraries/tachyon { }; tclap = tclap_1_2; @@ -11364,11 +10581,9 @@ with pkgs; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; - vulkan-tools = callPackage ../tools/graphics/vulkan-tools { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; - }; + vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; - wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { }; + wayland = callPackage ../development/libraries/wayland { }; wayland-scanner = callPackage ../development/libraries/wayland/scanner.nix { }; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; @@ -11399,9 +10614,7 @@ with pkgs; # bump when majoring of packages have updated webrtc-audio-processing = webrtc-audio-processing_0_3; - wildmidi = callPackage ../development/libraries/wildmidi { - inherit (darwin.apple_sdk.frameworks) OpenAL CoreAudioKit; - }; + wildmidi = callPackage ../development/libraries/wildmidi { }; wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { }; @@ -11426,9 +10639,7 @@ with pkgs; xgboostWithCuda = xgboost.override { cudaSupport = true; }; - yubico-pam = callPackage ../development/libraries/yubico-pam { - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; - }; + yubico-pam = callPackage ../development/libraries/yubico-pam { }; yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; @@ -11714,10 +10925,9 @@ with pkgs; ### DEVELOPMENT / R MODULES - R = darwin.apple_sdk_11_0.callPackage ../applications/science/math/R { + R = callPackage ../applications/science/math/R { # TODO: split docs into a separate output withRecommendedPackages = false; - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa Foundation; inherit (darwin) libobjc; }; @@ -11914,9 +11124,7 @@ with pkgs; deconz = qt5.callPackage ../servers/deconz { }; - doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust { - inherit (darwin.apple_sdk.frameworks) Security; - }; + doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust { }; dict = callPackage ../servers/dict { flex = flex_2_5_35; @@ -11956,9 +11164,7 @@ with pkgs; eventstore = callPackage ../servers/nosql/eventstore { }; - fedigroups = callPackage ../servers/fedigroups { - inherit (darwin.apple_sdk.frameworks) Security; - }; + fedigroups = callPackage ../servers/fedigroups { }; felix = callPackage ../servers/felix { }; @@ -11974,9 +11180,7 @@ with pkgs; freshrss = callPackage ../servers/web-apps/freshrss { }; freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { }); - freeswitch = callPackage ../servers/sip/freeswitch { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - }; + freeswitch = callPackage ../servers/sip/freeswitch { }; glabels-qt = libsForQt5.callPackage ../applications/graphics/glabels-qt { }; @@ -12055,9 +11259,7 @@ with pkgs; leafnode1 = callPackage ../servers/news/leafnode/1.nix { }; - lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { }; lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { nodejs = nodejs_18; @@ -12102,7 +11304,6 @@ with pkgs; inherit (callPackages ../servers/mpd { - inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; }) mpd mpd-small @@ -12215,14 +11416,7 @@ with pkgs; hsphfpd = callPackage ../servers/pulseaudio/hsphfpd.nix { }; - pulseaudio = callPackage ../servers/pulseaudio { - inherit (darwin.apple_sdk.frameworks) - CoreServices - AudioUnit - Cocoa - CoreAudio - ; - }; + pulseaudio = callPackage ../servers/pulseaudio { }; qpaeq = libsForQt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; @@ -12288,7 +11482,6 @@ with pkgs; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) developer_cmds DarwinTools; - inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost177; # Configure checks for specific version. icu = icu69; protobuf = protobuf_21; @@ -12478,7 +11671,6 @@ with pkgs; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { - inherit (darwin.apple_sdk.frameworks) Security; }; prometheus-zfs-exporter = callPackage ../servers/monitoring/prometheus/zfs-exporter.nix { }; prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { }; @@ -12510,11 +11702,7 @@ with pkgs; protobuf = protobuf_21; }; - rustic = callPackage ../by-name/ru/rustic/package.nix { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - - samba4 = darwin.apple_sdk_11_0.callPackage ../servers/samba/4.x.nix { }; + samba4 = callPackage ../servers/samba/4.x.nix { }; samba = samba4; @@ -12572,9 +11760,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - unpackerr = callPackage ../servers/unpackerr { - inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; - }; + unpackerr = callPackage ../servers/unpackerr { }; virtualenv = with python3Packages; toPythonApplication virtualenv; @@ -12582,8 +11768,6 @@ with pkgs; quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; - inherit (darwin.apple_sdk.frameworks) AppKit Foundation; - inherit (darwin.apple_sdk.libs) Xplugin; }; xorg = @@ -12638,9 +11822,7 @@ with pkgs; ### SERVERS / GEOSPATIAL - martin = callPackage ../servers/geospatial/martin { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + martin = callPackage ../servers/geospatial/martin { }; ### OS-SPECIFIC @@ -12727,9 +11909,7 @@ with pkgs; # `.override` clobbered. C.F. `llvmPackages` which does the same. darwin = recurseIntoAttrs (callPackage ./darwin-packages.nix { }); - defaultbrowser = callPackage ../os-specific/darwin/defaultbrowser { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + defaultbrowser = callPackage ../os-specific/darwin/defaultbrowser { }; displaylink = callPackage ../os-specific/linux/displaylink { inherit (linuxPackages) evdi; @@ -12775,15 +11955,11 @@ with pkgs; gpm-ncurses = gpm.override { withNcurses = true; }; - htop = callPackage ../tools/system/htop { - inherit (darwin) IOKit; - }; + htop = callPackage ../tools/system/htop { }; - humility = callPackage ../development/tools/rust/humility { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + humility = callPackage ../development/tools/rust/humility { }; - btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { }; + btop = callPackage ../tools/system/btop { }; btop-cuda = btop.override { cudaSupport = true; }; btop-rocm = btop.override { rocmSupport = true; }; @@ -12812,13 +11988,9 @@ with pkgs; linthesia = callPackage ../games/linthesia/default.nix { }; - osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp { }; - macfuse-stubs = callPackage ../os-specific/darwin/macfuse { - inherit (darwin.apple_sdk.frameworks) DiskArbitration; - }; + macfuse-stubs = callPackage ../os-specific/darwin/macfuse { }; projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { }; @@ -12924,11 +12096,9 @@ with pkgs; cryptodev = linuxPackages.cryptodev; - librasterlite2 = callPackage ../development/libraries/librasterlite2 { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + librasterlite2 = callPackage ../development/libraries/librasterlite2 { }; - librealsense = darwin.apple_sdk_11_0.callPackage ../development/libraries/librealsense { }; + librealsense = callPackage ../development/libraries/librealsense { }; librealsenseWithCuda = callPackage ../development/libraries/librealsense { cudaSupport = true; @@ -12991,15 +12161,10 @@ with pkgs; inherit modules; }; - nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell { - inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; - }; + nushell = callPackage ../shells/nushell { }; nushellPlugins = recurseIntoAttrs ( callPackage ../shells/nushell/plugins { - inherit (darwin.apple_sdk.frameworks) Security; - inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation; } ); @@ -13011,32 +12176,17 @@ with pkgs; nftables = callPackage ../os-specific/linux/nftables { }; - noah = callPackage ../os-specific/darwin/noah { - inherit (darwin.apple_sdk.frameworks) Hypervisor; - }; + noah = callPackage ../os-specific/darwin/noah { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; - gdlv = callPackage ../by-name/gd/gdlv/package.nix { - inherit (darwin.apple_sdk_11_0.frameworks) - AppKit - CoreGraphics - Foundation - Metal - ; - }; - - gotop = callPackage ../tools/system/gotop { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + gotop = callPackage ../tools/system/gotop { }; odin = callPackage ../by-name/od/odin/package.nix { llvmPackages = llvmPackages_18; }; - okapi = callPackage ../development/libraries/okapi { - inherit (darwin.apple_sdk.frameworks) Security; - }; + okapi = callPackage ../development/libraries/okapi { }; pam = if stdenv.hostPlatform.isLinux then @@ -13184,9 +12334,7 @@ with pkgs; # FIXME: `tcp-wrapper' is actually not OS-specific. trickster = callPackage ../servers/trickster/trickster.nix { }; - trinsic-cli = callPackage ../tools/admin/trinsic-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + trinsic-cli = callPackage ../tools/admin/trinsic-cli { }; # Upstream U-Boots: inherit (callPackage ../misc/uboot { }) @@ -13608,9 +12756,7 @@ with pkgs; wxGTK = wxGTK32; }; - whitebox-tools = callPackage ../applications/gis/whitebox-tools { - inherit (darwin.apple_sdk.frameworks) Security; - }; + whitebox-tools = callPackage ../applications/gis/whitebox-tools { }; zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; @@ -13654,9 +12800,7 @@ with pkgs; masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; - master_me = callPackage ../applications/audio/master_me { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + master_me = callPackage ../applications/audio/master_me { }; inherit ({ @@ -13694,9 +12838,7 @@ with pkgs; antimony = libsForQt5.callPackage ../applications/graphics/antimony { }; - apkeep = callPackage ../tools/misc/apkeep { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + apkeep = callPackage ../tools/misc/apkeep { }; apngasm = callPackage ../applications/graphics/apngasm { }; apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix { }; @@ -13706,9 +12848,7 @@ with pkgs; arelle = with python3Packages; toPythonApplication arelle; - asuka = callPackage ../applications/networking/browsers/asuka { - inherit (darwin.apple_sdk.frameworks) Security; - }; + asuka = callPackage ../applications/networking/browsers/asuka { }; astroid = callPackage ../applications/networking/mailreaders/astroid { vim = vim-full.override { features = "normal"; }; @@ -13721,9 +12861,7 @@ with pkgs; bambootracker-qt6 = bambootracker.override { withQt6 = true; }; - schismtracker = callPackage ../applications/audio/schismtracker { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + schismtracker = callPackage ../applications/audio/schismtracker { }; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; @@ -13777,13 +12915,6 @@ with pkgs; blender = callPackage ../by-name/bl/blender/package.nix { python3Packages = python311Packages; - inherit (darwin.apple_sdk.frameworks) - Cocoa - CoreGraphics - ForceFeedback - OpenAL - OpenGL - ; }; blender-hip = blender.override { hipSupport = true; }; @@ -13830,9 +12961,7 @@ with pkgs; cbconvert-gui = cbconvert.gui; - cddiscid = callPackage ../applications/audio/cd-discid { - inherit (darwin) IOKit; - }; + cddiscid = callPackage ../applications/audio/cd-discid { }; cdparanoia = cdparanoiaIII; @@ -13848,15 +12977,6 @@ with pkgs; chuck = callPackage ../applications/audio/chuck { inherit (darwin) DarwinTools; - inherit (darwin.apple_sdk.frameworks) - AppKit - Carbon - CoreAudio - CoreMIDI - CoreServices - Kernel - MultitouchSupport - ; }; cligh = python3Packages.callPackage ../development/tools/github/cligh { }; @@ -13870,7 +12990,6 @@ with pkgs; clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { }; cmus = callPackage ../applications/audio/cmus { - inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio VideoToolbox; libjack = libjack2; }; @@ -13885,14 +13004,7 @@ with pkgs; cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; - csound = callPackage ../applications/audio/csound { - inherit (pkgs.darwin.apple_sdk.frameworks) - Accelerate - AudioUnit - CoreAudio - CoreMIDI - ; - }; + csound = callPackage ../applications/audio/csound { }; csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { }; @@ -13906,9 +13018,7 @@ with pkgs; hamlib = hamlib_4; }; - cubicsdr = callPackage ../applications/radio/cubicsdr { - inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; - }; + cubicsdr = callPackage ../applications/radio/cubicsdr { }; cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; @@ -13978,9 +13088,7 @@ with pkgs; inherit (python3Packages) buildPythonApplication requests; }; - dmtx-utils = callPackage ../tools/graphics/dmtx-utils { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + dmtx-utils = callPackage ../tools/graphics/dmtx-utils { }; inherit (callPackage ../applications/virtualization/docker { }) docker_25 @@ -14036,9 +13144,7 @@ with pkgs; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); - ecpdap = callPackage ../development/embedded/fpga/ecpdap { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + ecpdap = callPackage ../development/embedded/fpga/ecpdap { }; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; @@ -14075,23 +13181,15 @@ with pkgs; pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; - epick = callPackage ../applications/graphics/epick { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + epick = callPackage ../applications/graphics/epick { }; espeak-classic = callPackage ../applications/audio/espeak { }; - espeak-ng = callPackage ../applications/audio/espeak-ng { - inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio; - }; + espeak-ng = callPackage ../applications/audio/espeak-ng { }; espeak = res.espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; - espflash = callPackage ../by-name/es/espflash/package.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; - evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; greenfoot = callPackage ../applications/editors/greenfoot { @@ -14126,13 +13224,9 @@ with pkgs; fetchmail = callPackage ../applications/misc/fetchmail { }; fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { }; - finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { - inherit (darwin.apple_sdk.frameworks) Security; - }; + finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { }; - finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils { - inherit (darwin.apple_sdk.frameworks) Security; - }; + finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils { }; firewalld-gui = firewalld.override { withGui = true; }; @@ -14144,7 +13238,7 @@ with pkgs; fmit = libsForQt5.callPackage ../applications/audio/fmit { }; - fnc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/fnc { }; + fnc = callPackage ../applications/version-management/fnc { }; focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { }; @@ -14154,14 +13248,7 @@ with pkgs; fritzing = qt6Packages.callPackage ../applications/science/electronics/fritzing { }; - ft2-clone = callPackage ../applications/audio/ft2-clone { - inherit (darwin.apple_sdk.frameworks) - CoreAudio - CoreMIDI - CoreServices - Cocoa - ; - }; + ft2-clone = callPackage ../applications/audio/ft2-clone { }; fvwm = fvwm2; @@ -14171,11 +13258,9 @@ with pkgs; }; }; - gaucheBootstrap = darwin.apple_sdk_11_0.callPackage ../development/interpreters/gauche/boot.nix { }; + gaucheBootstrap = callPackage ../development/interpreters/gauche/boot.nix { }; - gauche = darwin.apple_sdk_11_0.callPackage ../development/interpreters/gauche { - inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; - }; + gauche = callPackage ../development/interpreters/gauche { }; gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { }; @@ -14189,9 +13274,7 @@ with pkgs; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; - grandorgue = callPackage ../applications/audio/grandorgue { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + grandorgue = callPackage ../applications/audio/grandorgue { }; greetd = recurseIntoAttrs ( { @@ -14230,7 +13313,6 @@ with pkgs; welle-io = qt6Packages.callPackage ../applications/radio/welle-io { }; wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark { - inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration; libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; }; }; wireshark-qt = wireshark; @@ -14245,15 +13327,13 @@ with pkgs; fclones = callPackage ../tools/misc/fclones { }; - fclones-gui = darwin.apple_sdk_11_0.callPackage ../tools/misc/fclones/gui.nix { }; + fclones-gui = callPackage ../tools/misc/fclones/gui.nix { }; feh = callPackage ../applications/graphics/feh { imlib2 = imlib2Full; }; - filezilla = darwin.apple_sdk_11_0.callPackage ../applications/networking/ftp/filezilla { - inherit (darwin.apple_sdk_11_0.frameworks) CoreServices Security; - }; + filezilla = callPackage ../applications/networking/ftp/filezilla { }; buildMozillaMach = opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) { }; @@ -14395,16 +13475,7 @@ with pkgs; inherit buildPythonApplication; }; - foxotron = callPackage ../applications/graphics/foxotron { - inherit (darwin.apple_sdk.frameworks) - AVFoundation - Carbon - Cocoa - CoreAudio - Kernel - OpenGL - ; - }; + foxotron = callPackage ../applications/graphics/foxotron { }; freedv = callPackage ../by-name/fr/freedv/package.nix { codec2 = codec2.override { @@ -14428,7 +13499,6 @@ with pkgs; gimp3 = callPackage ../applications/graphics/gimp { lcms = lcms2; - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; gimp3-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { @@ -14445,7 +13515,6 @@ with pkgs; gimp = callPackage ../applications/graphics/gimp/2.0 { autoreconfHook = buildPackages.autoreconfHook269; lcms = lcms2; - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { @@ -14524,9 +13593,7 @@ with pkgs; jdk = jdk.override { enableJavaFX = true; }; }; - gkrellm = callPackage ../applications/misc/gkrellm { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + gkrellm = callPackage ../applications/misc/gkrellm { }; gnunet = callPackage ../applications/networking/p2p/gnunet { }; @@ -14601,9 +13668,7 @@ with pkgs; inherit (python3Packages) pygments; }; - hors = callPackage ../development/tools/hors { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hors = callPackage ../development/tools/hors { }; hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; @@ -14786,9 +13851,7 @@ with pkgs; libde265Support = false; }; - imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; - }; + imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix { }; imagemagick6Big = imagemagick6.override { ghostscriptSupport = true; @@ -14820,7 +13883,6 @@ with pkgs; imagemagick = lowPrio ( callPackage ../applications/graphics/ImageMagick { - inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; } ); @@ -14848,7 +13910,7 @@ with pkgs; callPackages ../applications/graphics/inkscape/extensions.nix { } ); - inlyne = darwin.apple_sdk_11_0.callPackage ../applications/misc/inlyne { }; + inlyne = callPackage ../applications/misc/inlyne { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; @@ -14883,9 +13945,7 @@ with pkgs; jalv-qt = jalv.override { useQt = true; }; - jameica = callPackage ../applications/office/jameica { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + jameica = callPackage ../applications/office/jameica { }; js8call = qt5.callPackage ../applications/radio/js8call { }; @@ -14961,8 +14021,7 @@ with pkgs; ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { - }; + kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { }; kubeval = callPackage ../applications/networking/cluster/kubeval { }; @@ -14972,9 +14031,9 @@ with pkgs; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; - kubectl-view-allocations = callPackage ../applications/networking/cluster/kubectl-view-allocations { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubectl-view-allocations = + callPackage ../applications/networking/cluster/kubectl-view-allocations + { }; kubelogin-oidc = callPackage ../by-name/ku/kubelogin-oidc/package.nix { buildGoModule = buildGo124Module; @@ -15113,22 +14172,16 @@ with pkgs; withFonts = true; }; - libresprite = callPackage ../applications/editors/libresprite { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; - }; + libresprite = callPackage ../applications/editors/libresprite { }; libutp = callPackage ../applications/networking/p2p/libutp { }; libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { }; - littlegptracker = callPackage ../applications/audio/littlegptracker { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + littlegptracker = callPackage ../applications/audio/littlegptracker { }; ledger-web = callPackage ../applications/office/ledger-web { }; - lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { }; linphone = libsForQt5.callPackage ../applications/networking/instant-messengers/linphone { }; @@ -15190,9 +14243,7 @@ with pkgs; mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { }; - mdzk = callPackage ../applications/misc/mdzk { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + mdzk = callPackage ../applications/misc/mdzk { }; mediaelch = mediaelch-qt5; mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { }; @@ -15204,24 +14255,11 @@ with pkgs; gconf = gnome2.GConf; }; - menyoki = callPackage ../applications/graphics/menyoki { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + menyoki = callPackage ../applications/graphics/menyoki { }; - mercurial = callPackage ../applications/version-management/mercurial { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + mercurial = callPackage ../applications/version-management/mercurial { }; - sapling = callPackage ../applications/version-management/sapling { - inherit (darwin.apple_sdk.frameworks) - Cocoa - CoreFoundation - CoreGraphics - CoreServices - Security - WebKit - ; - }; + sapling = callPackage ../applications/version-management/sapling { }; mercurialFull = mercurial.override { fullBuild = true; }; @@ -15236,17 +14274,11 @@ with pkgs; miniaudicle = qt6Packages.callPackage ../applications/audio/miniaudicle { }; - minidsp = callPackage ../applications/audio/minidsp { - inherit (darwin.apple_sdk.frameworks) AppKit IOKit; - }; + minidsp = callPackage ../applications/audio/minidsp { }; - minicom = callPackage ../tools/misc/minicom { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + minicom = callPackage ../tools/misc/minicom { }; - minikube = callPackage ../applications/networking/cluster/minikube { - inherit (darwin.apple_sdk.frameworks) vmnet; - }; + minikube = callPackage ../applications/networking/cluster/minikube { }; minitube = libsForQt5.callPackage ../applications/video/minitube { }; @@ -15257,7 +14289,6 @@ with pkgs; }; mmlgui = callPackage ../applications/audio/mmlgui { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; libvgm = libvgm.override { withAllEmulators = false; emulators = [ @@ -15267,9 +14298,7 @@ with pkgs; }; }; - moc = callPackage ../applications/audio/moc { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + moc = callPackage ../applications/audio/moc { }; monotone = callPackage ../applications/version-management/monotone { lua = lua5; @@ -15321,7 +14350,6 @@ with pkgs; edgetx = libsForQt5.callPackage ../applications/misc/edgetx { }; mpg123 = callPackage ../applications/audio/mpg123 { - inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox; jack = libjack2; }; @@ -15423,14 +14451,10 @@ with pkgs; protobuf = protobuf_21; }; - p4 = callPackage ../applications/version-management/p4 { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security; - }; + p4 = callPackage ../applications/version-management/p4 { }; p4v = qt6Packages.callPackage ../applications/version-management/p4v { }; - pc-ble-driver = callPackage ../development/libraries/pc-ble-driver { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + pc-ble-driver = callPackage ../development/libraries/pc-ble-driver { }; pcmanfm-qt = lxqt.pcmanfm-qt; @@ -15462,8 +14486,7 @@ with pkgs; polyphone = qt6.callPackage ../applications/audio/polyphone { }; - roxctl = callPackage ../applications/networking/cluster/roxctl { - }; + roxctl = callPackage ../applications/networking/cluster/roxctl { }; scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { }); @@ -15482,18 +14505,13 @@ with pkgs; softmaker-office-nx ; - synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { }; taxi-cli = with python3Packages; toPythonApplication taxi; - mpop = callPackage ../applications/networking/mpop { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mpop = callPackage ../applications/networking/mpop { }; msmtp = callPackage ../applications/networking/msmtp { - inherit (darwin.apple_sdk.frameworks) Security; autoreconfHook = buildPackages.autoreconfHook269; }; @@ -15510,15 +14528,12 @@ with pkgs; enableGL = false; }; - muso = callPackage ../applications/audio/muso { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + muso = callPackage ../applications/audio/muso { }; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK32; - inherit (darwin.apple_sdk.frameworks) Cocoa; }; mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { }; @@ -15547,9 +14562,7 @@ with pkgs; addThumbnailer = true; }; - gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { }; obs-studio = qt6Packages.callPackage ../applications/video/obs-studio { }; @@ -15572,11 +14585,9 @@ with pkgs; opencpn = callPackage ../applications/misc/opencpn { inherit (darwin) DarwinTools; - inherit (darwin.apple_sdk.frameworks) AppKit; }; - openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { - }; + openimageio = callPackage ../development/libraries/openimageio { }; open-music-kontrollers = lib.recurseIntoAttrs { eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; @@ -15592,7 +14603,7 @@ with pkgs; vm = callPackage ../applications/audio/open-music-kontrollers/vm.nix { }; }; - openrsync = darwin.apple_sdk_11_0.callPackage ../applications/networking/sync/openrsync { }; + openrsync = callPackage ../applications/networking/sync/openrsync { }; openscad = libsForQt5.callPackage ../applications/graphics/openscad { }; @@ -15604,9 +14615,7 @@ with pkgs; organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { }; - owofetch = callPackage ../tools/misc/owofetch { - inherit (darwin.apple_sdk.frameworks) Foundation DiskArbitration; - }; + owofetch = callPackage ../tools/misc/owofetch { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi { }; @@ -15642,8 +14651,7 @@ with pkgs; sed = gnused; }; - pencil = callPackage ../applications/graphics/pencil { - }; + pencil = callPackage ../applications/graphics/pencil { }; petrifoo = callPackage ../applications/audio/petrifoo { inherit (gnome2) libgnomecanvas; @@ -15694,9 +14702,7 @@ with pkgs; pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { }; - pomodoro = callPackage ../applications/misc/pomodoro { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + pomodoro = callPackage ../applications/misc/pomodoro { }; pothos = libsForQt5.callPackage ../applications/radio/pothos { }; @@ -15886,18 +14892,14 @@ with pkgs; rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; - rdedup = callPackage ../tools/backup/rdedup { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rdedup = callPackage ../tools/backup/rdedup { }; reaper = callPackage ../applications/audio/reaper { jackLibrary = libjack2; # Another option is "pipewire.jack". ffmpeg = ffmpeg_4-headless; }; - reddsaver = callPackage ../applications/misc/reddsaver { - inherit (darwin.apple_sdk.frameworks) Security; - }; + reddsaver = callPackage ../applications/misc/reddsaver { }; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; @@ -15952,15 +14954,11 @@ with pkgs; rtl-sdr = rtl-sdr-blog; - rucredstash = callPackage ../tools/security/rucredstash { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rucredstash = callPackage ../tools/security/rucredstash { }; rusty-psn-gui = rusty-psn.override { withGui = true; }; - rymdport = callPackage ../applications/networking/rymdport { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; + rymdport = callPackage ../applications/networking/rymdport { }; savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan { }; @@ -16043,7 +15041,7 @@ with pkgs; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer { + prusa-slicer = callPackage ../applications/misc/prusa-slicer { # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory # on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds # with --cores 32 on clang). @@ -16054,9 +15052,7 @@ with pkgs; llvmPackages.stdenv; }; - super-slicer = - darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix - { }; + super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; super-slicer-beta = super-slicer.beta; @@ -16076,9 +15072,7 @@ with pkgs; soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; - sox = callPackage ../applications/misc/audio/sox { - inherit (darwin.apple_sdk.frameworks) CoreAudio; - }; + sox = callPackage ../applications/misc/audio/sox { }; spek = callPackage ../applications/audio/spek { autoreconfHook = buildPackages.autoreconfHook269; @@ -16127,7 +15121,6 @@ with pkgs; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; - inherit (darwin.apple_sdk.frameworks) CoreServices Security; }) subversion ; @@ -16144,17 +15137,13 @@ with pkgs; git = gitMinimal; }; - survex = callPackage ../applications/misc/survex { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; + survex = callPackage ../applications/misc/survex { }; supersonic-wayland = supersonic.override { waylandSupport = true; }; - sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; @@ -16181,16 +15170,7 @@ with pkgs; systemdSupport = true; }; - synergy = libsForQt5.callPackage ../applications/misc/synergy { - inherit (darwin.apple_sdk_11_0.frameworks) - ApplicationServices - Carbon - Cocoa - CoreServices - ScreenSaver - UserNotifications - ; - }; + synergy = libsForQt5.callPackage ../applications/misc/synergy { }; synergyWithoutGUI = synergy.override { withGUI = false; }; @@ -16222,7 +15202,6 @@ with pkgs; inherit (callPackage ../applications/graphics/tesseract { - inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }) tesseract3 tesseract4 @@ -16273,13 +15252,10 @@ with pkgs; ; timidity = callPackage ../tools/misc/timidity { - inherit (darwin.apple_sdk.frameworks) CoreAudio; inherit (darwin) libobjc; }; - tiny = callPackage ../applications/networking/irc/tiny { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + tiny = callPackage ../applications/networking/irc/tiny { }; tipp10 = qt6.callPackage ../applications/misc/tipp10 { }; @@ -16300,14 +15276,10 @@ with pkgs; transmission_3-qt = transmission_3.override { enableQt = true; }; transmission_3_noSystemd = transmission_3.override { enableSystemd = false; }; - # Needs macOS >= 10.14.6 - transmission_4 = - darwin.apple_sdk_11_0.callPackage ../applications/networking/p2p/transmission/4.nix - { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation; - fmt = fmt_9; - libutp = libutp_3_4; - }; + transmission_4 = callPackage ../applications/networking/p2p/transmission/4.nix { + fmt = fmt_9; + libutp = libutp_3_4; + }; libtransmission_4 = transmission_4.override { installLib = true; enableDaemon = false; @@ -16340,9 +15312,7 @@ with pkgs; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; - terminal-typeracer = callPackage ../applications/misc/terminal-typeracer { - inherit (darwin.apple_sdk.frameworks) Security; - }; + terminal-typeracer = callPackage ../applications/misc/terminal-typeracer { }; buildTypstPackage = callPackage ../build-support/build-typst-package.nix { }; @@ -16376,15 +15346,14 @@ with pkgs; vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - vengi-tools = darwin.apple_sdk_11_0.callPackage ../applications/graphics/vengi-tools { - inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; + vengi-tools = callPackage ../applications/graphics/vengi-tools { + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; veusz = libsForQt5.callPackage ../applications/graphics/veusz { }; vim = vimUtils.makeCustomizable ( callPackage ../applications/editors/vim { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; } ); @@ -16400,12 +15369,6 @@ with pkgs; vim-full = vimUtils.makeCustomizable ( callPackage ../applications/editors/vim/full.nix { - inherit (darwin.apple_sdk.frameworks) - CoreServices - Cocoa - Foundation - CoreData - ; inherit (darwin) libobjc; } ); @@ -16544,10 +15507,6 @@ with pkgs; callPackage ../by-name/vs/vscode-extensions-update/vscode-extensions-update-script.nix { }; - vscode-js-debug = callPackage ../by-name/vs/vscode-js-debug/package.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Security; - }; - vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; vscodium-fhs = vscodium.fhs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; @@ -16558,17 +15517,10 @@ with pkgs; openvscode-server = callPackage ../servers/openvscode-server { nodejs = nodejs_18; - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; }; code-server = callPackage ../servers/code-server { nodejs = nodejs_20; - inherit (darwin.apple_sdk.frameworks) - AppKit - Cocoa - CoreServices - Security - ; }; whispers = with python3Packages; toPythonApplication whispers; @@ -16659,9 +15611,7 @@ with pkgs; wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { }; - wordnet = callPackage ../applications/misc/wordnet { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + wordnet = callPackage ../applications/misc/wordnet { }; worldengine-cli = python3Packages.worldengine; @@ -16730,7 +15680,7 @@ with pkgs; inherit (gnome2) libglade GConf; }; - xournalpp = darwin.apple_sdk_11_0.callPackage ../applications/graphics/xournalpp { + xournalpp = callPackage ../applications/graphics/xournalpp { lua = lua5_3; }; @@ -16761,9 +15711,7 @@ with pkgs; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xmp = callPackage ../applications/audio/xmp { - inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; - }; + xmp = callPackage ../applications/audio/xmp { }; xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; @@ -16785,9 +15733,7 @@ with pkgs; pnpm = pnpm_10; }; - youtube-tui = callPackage ../applications/video/youtube-tui { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }; + youtube-tui = callPackage ../applications/video/youtube-tui { }; yt-dlp-light = yt-dlp.override { atomicparsleySupport = false; @@ -16836,9 +15782,7 @@ with pkgs; ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS - alfis = callPackage ../applications/blockchains/alfis { - inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; - }; + alfis = callPackage ../applications/blockchains/alfis { }; alfis-nogui = alfis.override { withGui = false; }; @@ -16870,9 +15814,7 @@ with pkgs; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; - electrs = callPackage ../applications/blockchains/electrs { - inherit (darwin.apple_sdk.frameworks) Security; - }; + electrs = callPackage ../applications/blockchains/electrs { }; elements = libsForQt5.callPackage ../applications/blockchains/elements { withGui = true; @@ -16896,7 +15838,6 @@ with pkgs; go-ethereum = callPackage ../by-name/go/go-ethereum/package.nix { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; }; gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research { @@ -16914,9 +15855,7 @@ with pkgs; ledger-agent = with python3Packages; toPythonApplication ledger-agent; - monero-cli = callPackage ../applications/blockchains/monero-cli { - inherit (darwin.apple_sdk.frameworks) CoreData IOKit; - }; + monero-cli = callPackage ../applications/blockchains/monero-cli { }; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { }; @@ -16926,9 +15865,7 @@ with pkgs; pycoin = with python3Packages; toPythonApplication pycoin; - snarkos = callPackage ../applications/blockchains/snarkos { - inherit (darwin.apple_sdk.frameworks) Security; - }; + snarkos = callPackage ../applications/blockchains/snarkos { }; inherit (callPackages ../applications/blockchains/teos { }) teos @@ -16943,13 +15880,10 @@ with pkgs; }; zcash = callPackage ../applications/blockchains/zcash { - inherit (darwin.apple_sdk.frameworks) Security; stdenv = llvmPackages.stdenv; }; - polkadot = callPackage ../applications/blockchains/polkadot { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + polkadot = callPackage ../applications/blockchains/polkadot { }; samplv1 = qt6.callPackage ../applications/audio/samplv1 { }; @@ -16980,9 +15914,7 @@ with pkgs; drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; - eureka-ideas = callPackage ../applications/misc/eureka-ideas { - inherit (darwin.apple_sdk.frameworks) Security; - }; + eureka-ideas = callPackage ../applications/misc/eureka-ideas { }; phonemizer = with python3Packages; toPythonApplication phonemizer; @@ -17052,9 +15984,7 @@ with pkgs; amoeba = callPackage ../games/amoeba { }; amoeba-data = callPackage ../games/amoeba/data.nix { }; - anki = callPackage ../games/anki { - inherit (darwin.apple_sdk.frameworks) AVKit CoreAudio; - }; + anki = callPackage ../games/anki { }; anki-bin = callPackage ../games/anki/bin.nix { }; anki-sync-server = callPackage ../games/anki/sync-server.nix { }; @@ -17079,7 +16009,6 @@ with pkgs; bugdom = callPackage ../games/bugdom { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL; }; cataclysmDDA = callPackage ../games/cataclysm-dda { }; @@ -17168,20 +16097,14 @@ with pkgs; d2x-rebirth-full ; - easyrpg-player = callPackage ../games/easyrpg-player { - inherit (darwin.apple_sdk.frameworks) Foundation AudioUnit AudioToolbox; - }; + easyrpg-player = callPackage ../games/easyrpg-player { }; - exult = callPackage ../games/exult { - inherit (darwin.apple_sdk.frameworks) AudioUnit; - }; + exult = callPackage ../games/exult { }; fallout-ce = callPackage ../games/fallout-ce/fallout-ce.nix { }; fallout2-ce = callPackage ../games/fallout-ce/fallout2-ce.nix { }; - flare = callPackage ../games/flare { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + flare = callPackage ../games/flare { }; fltrator = callPackage ../games/fltrator { fltk = fltk-minimal; @@ -17217,9 +16140,7 @@ with pkgs; factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { }; - ferium = callPackage ../games/ferium { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + ferium = callPackage ../games/ferium { }; flightgear = libsForQt5.callPackage ../games/flightgear { }; @@ -17318,8 +16239,7 @@ with pkgs; guile = guile_2_0; }; - liquidwar5 = callPackage ../games/liquidwar/5.nix { - }; + liquidwar5 = callPackage ../games/liquidwar/5.nix { }; maptool = callPackage ../games/maptool { # MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging @@ -17352,7 +16272,6 @@ with pkgs; mudlet = libsForQt5.callPackage ../games/mudlet { lua = lua5_1; - inherit (darwin.apple_sdk_11_0.frameworks) AppKit; }; blightmud = callPackage ../games/blightmud { }; @@ -17377,9 +16296,7 @@ with pkgs; openloco = pkgsi686Linux.callPackage ../games/openloco { }; - openmw = libsForQt5.callPackage ../games/openmw { - inherit (darwin.apple_sdk.frameworks) CoreMedia VideoDecodeAcceleration VideoToolbox; - }; + openmw = libsForQt5.callPackage ../games/openmw { }; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; @@ -17394,9 +16311,7 @@ with pkgs; openra = openraPackages.engines.release; - openspades = callPackage ../games/openspades { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + openspades = callPackage ../games/openspades { }; openttd = callPackage ../games/openttd { zlib = zlib.override { @@ -17457,15 +16372,7 @@ with pkgs; quake3hires = callPackage ../games/quake3/content/hires.nix { }; - quakespasm = callPackage ../games/quakespasm { - inherit (darwin.apple_sdk.frameworks) - Cocoa - CoreAudio - CoreFoundation - IOKit - OpenGL - ; - }; + quakespasm = callPackage ../games/quakespasm { }; vkquake = callPackage ../games/quakespasm/vulkan.nix { }; rogue = callPackage ../games/rogue { @@ -17482,15 +16389,7 @@ with pkgs; openjdk = openjdk17; }; - scummvm = callPackage ../games/scummvm { - inherit (darwin.apple_sdk.frameworks) - Cocoa - AudioToolbox - Carbon - CoreMIDI - AudioUnit - ; - }; + scummvm = callPackage ../games/scummvm { }; inherit (callPackage ../games/scummvm/games.nix { }) beneath-a-steel-sky @@ -17551,27 +16450,17 @@ with pkgs; stuntrally = callPackage ../games/stuntrally { boost = boost183; }; - superTuxKart = darwin.apple_sdk_11_0.callPackage ../games/super-tux-kart { - inherit (darwin.apple_sdk_11_0.frameworks) - Cocoa - IOKit - OpenAL - IOBluetooth - ; - }; + superTuxKart = callPackage ../games/super-tux-kart { }; synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { }; the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix { lua = lua5_2; - inherit (darwin.apple_sdk.frameworks) Cocoa; }; tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; - teeworlds = callPackage ../games/teeworlds { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + teeworlds = callPackage ../games/teeworlds { }; teeworlds-server = teeworlds.override { buildClient = false; }; tengine = callPackage ../servers/http/tengine { @@ -17602,17 +16491,12 @@ with pkgs; vessel = pkgsi686Linux.callPackage ../games/vessel { }; - vvvvvv = callPackage ../by-name/vv/vvvvvv/package.nix { - inherit (darwin.apple_sdk.frameworks) Foundation IOKit; - }; - warsow-engine = callPackage ../games/warsow/engine.nix { }; warsow = callPackage ../games/warsow { }; wesnoth = callPackage ../games/wesnoth { boost = boost186; - inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234 lua = lua5_4.override { postConfigure = '' @@ -17651,7 +16535,6 @@ with pkgs; inherit (callPackage ../games/quake2/yquake2 { - inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }) yquake2 yquake2-ctf @@ -17780,12 +16663,6 @@ with pkgs; pyxdg wrapPython ; - inherit (darwin.apple_sdk.frameworks) - CoreLocation - ApplicationServices - Foundation - Cocoa - ; geoclue = geoclue2; }) redshift @@ -17838,13 +16715,9 @@ with pkgs; ### SCIENCE/BIOLOGY - ants = callPackage ../applications/science/biology/ants { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + ants = callPackage ../applications/science/biology/ants { }; - blast = callPackage ../applications/science/biology/blast { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + blast = callPackage ../applications/science/biology/blast { }; blast-bin = callPackage ../applications/science/biology/blast/bin.nix { }; @@ -17928,14 +16801,7 @@ with pkgs; cantor = libsForQt5.cantor; - clblas = callPackage ../development/libraries/science/math/clblas { - inherit (darwin.apple_sdk.frameworks) - Accelerate - CoreGraphics - CoreVideo - OpenCL - ; - }; + clblas = callPackage ../development/libraries/science/math/clblas { }; labplot = libsForQt5.callPackage ../applications/science/math/labplot { }; @@ -18207,7 +17073,7 @@ with pkgs; }; isabelle-components = recurseIntoAttrs (callPackage ../by-name/is/isabelle/components { }); - killport = darwin.apple_sdk_11_0.callPackage ../tools/misc/killport { }; + killport = callPackage ../tools/misc/killport { }; lean3 = lean; mathlibtools = with python3Packages; toPythonApplication mathlibtools; @@ -18346,7 +17212,6 @@ with pkgs; { opencv4 = opencv4WithoutCuda; # Used only for image loading. blas = openblas; - inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; } // (config.caffe or { }) ); @@ -18424,9 +17289,7 @@ with pkgs; ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; }; - rink = callPackage ../applications/science/misc/rink { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rink = callPackage ../applications/science/misc/rink { }; spyder = with python3.pkgs; toPythonApplication spyder; @@ -18438,9 +17301,7 @@ with pkgs; ### SCIENCE / PHYSICS - applgrid = callPackage ../development/libraries/physics/applgrid { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + applgrid = callPackage ../development/libraries/physics/applgrid { }; hepmc3 = callPackage ../development/libraries/physics/hepmc3 { python = null; @@ -18480,9 +17341,7 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer { }; - clinfo = callPackage ../tools/system/clinfo { - inherit (darwin.apple_sdk.frameworks) OpenCL; - }; + clinfo = callPackage ../tools/system/clinfo { }; cups = callPackage ../misc/cups { }; @@ -18591,9 +17450,7 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; - hyperfine = callPackage ../tools/misc/hyperfine { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hyperfine = callPackage ../tools/misc/hyperfine { }; hjson = with python3Packages; toPythonApplication hjson; @@ -18616,7 +17473,6 @@ with pkgs; jack2 = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; - inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate; inherit (darwin) libobjc; }; @@ -18651,9 +17507,7 @@ with pkgs; ; kops = kops_1_29; - lighthouse = darwin.apple_sdk_11_0.callPackage ../applications/blockchains/lighthouse { - inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security SystemConfiguration; - }; + lighthouse = callPackage ../applications/blockchains/lighthouse { }; lilypond = callPackage ../misc/lilypond { }; @@ -18686,7 +17540,6 @@ with pkgs; callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; - inherit (darwin.apple_sdk.frameworks) Security; } ); @@ -18708,7 +17561,6 @@ with pkgs; callPackage ../tools/package-management/lix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; - inherit (darwin.apple_sdk.frameworks) Security; } ); @@ -18828,16 +17680,12 @@ with pkgs; nix-derivation = haskell.lib.compose.justStaticExecutables haskellPackages.nix-derivation; nix-diff = haskell.lib.compose.justStaticExecutables haskellPackages.nix-diff; - nix-du = callPackage ../tools/package-management/nix-du { - inherit (darwin.apple_sdk.frameworks) Security; - }; + nix-du = callPackage ../tools/package-management/nix-du { }; nix-info = callPackage ../tools/nix/info { }; nix-info-tested = nix-info.override { doCheck = true; }; - nix-index-unwrapped = callPackage ../tools/package-management/nix-index { - inherit (darwin.apple_sdk.frameworks) Security; - }; + nix-index-unwrapped = callPackage ../tools/package-management/nix-index { }; nix-index = callPackage ../tools/package-management/nix-index/wrapper.nix { }; nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter); @@ -18863,10 +17711,6 @@ with pkgs; nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { }; - nixci = callPackage ../by-name/ni/nixci/package.nix { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration IOKit; - }; - nixfmt-classic = haskellPackages.nixfmt.bin; nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { }; @@ -18905,9 +17749,7 @@ with pkgs; resp-app = libsForQt5.callPackage ../applications/misc/resp-app { }; - stork = darwin.apple_sdk_11_0.callPackage ../applications/misc/stork { - inherit (darwin.apple_sdk_11_0.frameworks) Security; - }; + stork = callPackage ../applications/misc/stork { }; pgadmin4 = callPackage ../tools/admin/pgadmin { }; @@ -18917,9 +17759,7 @@ with pkgs; philipstv = with python3Packages; toPythonApplication philipstv; - pjsip = darwin.apple_sdk_11_0.callPackage ../applications/networking/pjsip { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreFoundation Security; - }; + pjsip = callPackage ../applications/networking/pjsip { }; pyupgrade = with python3Packages; toPythonApplication pyupgrade; @@ -18942,7 +17782,7 @@ with pkgs; qzdl = libsForQt5.callPackage ../games/qzdl { }; - rbspy = darwin.apple_sdk_11_0.callPackage ../development/tools/rbspy { }; + rbspy = callPackage ../development/tools/rbspy { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { inherit @@ -18961,9 +17801,7 @@ with pkgs; inherit (ocamlPackages) sail; }; - timeloop = - pkgs.darwin.apple_sdk_11_0.callPackage ../applications/science/computer-architecture/timeloop - { }; + timeloop = callPackage ../applications/science/computer-architecture/timeloop { }; mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { }; @@ -18997,9 +17835,7 @@ with pkgs; hasktags = haskellPackages.hasktags; }; - spacenavd = callPackage ../misc/drivers/spacenavd { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + spacenavd = callPackage ../misc/drivers/spacenavd { }; tellico = libsForQt5.callPackage ../applications/misc/tellico { }; @@ -19031,16 +17867,12 @@ with pkgs; vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv; - vaultwarden = callPackage ../tools/security/vaultwarden { - inherit (darwin.apple_sdk.frameworks) Security CoreServices SystemConfiguration; - }; + vaultwarden = callPackage ../tools/security/vaultwarden { }; vaultwarden-sqlite = vaultwarden; vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; }; vaultwarden-postgresql = vaultwarden.override { dbBackend = "postgresql"; }; - veilid = darwin.apple_sdk_11_0.callPackage ../tools/networking/veilid { - inherit (darwin.apple_sdk.frameworks) AppKit Security; - }; + veilid = callPackage ../tools/networking/veilid { }; vimUtils = callPackage ../applications/editors/vim/plugins/utils/vim-utils.nix { }; @@ -19048,10 +17880,6 @@ with pkgs; vimb = wrapFirefox vimb-unwrapped { }; - vips = callPackage ../by-name/vi/vips/package.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; - }; - vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; }); vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { @@ -19060,7 +17888,7 @@ with pkgs; wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; - wamr = darwin.apple_sdk_11_0.callPackage ../development/interpreters/wamr { }; + wamr = callPackage ../development/interpreters/wamr { }; wasmer = callPackage ../development/interpreters/wasmer { llvmPackages = llvmPackages_18; @@ -19144,8 +17972,6 @@ with pkgs; }; xhyve = callPackage ../applications/virtualization/xhyve { - inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; - inherit (darwin.apple_sdk.libs) xpc; inherit (darwin) libobjc; }; @@ -19340,9 +18166,7 @@ with pkgs; inherit (callPackage ../applications/misc/zettlr { }) zettlr; - fac-build = callPackage ../development/tools/build-managers/fac { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + fac-build = callPackage ../development/tools/build-managers/fac { }; zrythm = callPackage ../applications/audio/zrythm { inherit (plasma5Packages) breeze-icons; @@ -19368,10 +18192,6 @@ with pkgs; yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { }); - yazi-unwrapped = callPackage ../by-name/ya/yazi-unwrapped/package.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; - animdl = python3Packages.callPackage ../applications/video/animdl { }; dillo = callPackage ../by-name/di/dillo/package.nix { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 5e682627d109..e5272950b292 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -251,7 +251,6 @@ rec { nfd = callPackage ../development/lua-modules/nfd { inherit (pkgs) zenity; - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; vicious = callPackage ( diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 55c34edbdfac..f1cb6b1ab986 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -118,9 +118,7 @@ let bitwuzla-cxx = callPackage ../development/ocaml-modules/bitwuzla-cxx { }; - bjack = callPackage ../development/ocaml-modules/bjack { - inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreAudio; - }; + bjack = callPackage ../development/ocaml-modules/bjack { }; bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { }; @@ -145,9 +143,7 @@ let ca-certs-nss = callPackage ../development/ocaml-modules/ca-certs-nss { }; - cairo2 = callPackage ../development/ocaml-modules/cairo2 { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; - }; + cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; calendar = callPackage ../development/ocaml-modules/calendar { }; @@ -561,45 +557,24 @@ let ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { }; ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { ffmpeg = pkgs.ffmpeg_6; - inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix { ffmpeg = pkgs.ffmpeg_6; - inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { ffmpeg = pkgs.ffmpeg_6; - inherit (pkgs.darwin.apple_sdk.frameworks) - AppKit - AudioToolbox - AVFoundation - Cocoa - CoreImage - ForceFeedback - OpenGL - VideoToolbox - ; }; ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix { ffmpeg = pkgs.ffmpeg_6; - inherit (pkgs.darwin.apple_sdk.frameworks) - AppKit - CoreImage - OpenGL - VideoToolbox - ; }; ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix { ffmpeg = pkgs.ffmpeg_6; - inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix { ffmpeg = pkgs.ffmpeg_6; - inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { ffmpeg = pkgs.ffmpeg_6; - inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; fiber = callPackage ../development/ocaml-modules/fiber { }; @@ -717,9 +692,7 @@ let inherit (pkgs) gsl; }; - gstreamer = callPackage ../development/ocaml-modules/gstreamer { - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation; - }; + gstreamer = callPackage ../development/ocaml-modules/gstreamer { }; ### H ### @@ -1088,9 +1061,7 @@ let lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; - labltk = callPackage ../development/ocaml-modules/labltk { - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - }; + labltk = callPackage ../development/ocaml-modules/labltk { }; lacaml = callPackage ../development/ocaml-modules/lacaml { }; @@ -1450,9 +1421,7 @@ let ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { }; - ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { - inherit (pkgs.darwin.apple_sdk.frameworks) Foundation AppKit; - }; + ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { }; ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; @@ -2083,15 +2052,7 @@ let trie = callPackage ../development/ocaml-modules/trie { }; - tsdl = callPackage ../development/ocaml-modules/tsdl { - inherit (pkgs.darwin.apple_sdk.frameworks) - AudioToolbox - Cocoa - CoreAudio - CoreVideo - ForceFeedback - ; - }; + tsdl = callPackage ../development/ocaml-modules/tsdl { }; tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7610a80c8ac2..33de7a8df71c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13,7 +13,6 @@ lib, buildPackages, pkgs, - darwin, fetchurl, fetchpatch, fetchpatch2, @@ -20051,7 +20050,6 @@ with self; url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.103.tar.gz"; hash = "sha256-L16N0tsNZEVVhITKbULYOcWpfuiqGyUOaU1n1bf2Y0w="; }; - buildInputs = [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices ]; meta = { description = "Manipulate Mac OS X pasteboards"; license = with lib.licenses; [ @@ -32228,7 +32226,6 @@ with self; hash = "sha256-nCypGyi6bZDEXqdb7wlGGzk9cFzmYkWGP1slBpXDfHw="; }) ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; doCheck = !stdenv.hostPlatform.isAarch64; meta = { description = "Perl extension for getting CPU information. Currently only number of CPU's supported"; @@ -32532,16 +32529,12 @@ with self; url = "mirror://cpan/authors/id/V/VK/VKON/Tcl-1.27.tar.gz"; hash = "sha256-+DhYd6Sp7Z89OQPS0PfNcPrDzmgyxg9gCmghzuP7WHI="; }; - propagatedBuildInputs = - [ - pkgs.tclPackages.bwidget - pkgs.tcl - pkgs.tclPackages.tix - pkgs.tk - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + propagatedBuildInputs = [ + pkgs.tclPackages.bwidget + pkgs.tcl + pkgs.tclPackages.tix + pkgs.tk + ]; makeMakerFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--tclsh=${pkgs.tcl}/bin/tclsh" "--nousestubs" diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ea7031d03df8..008f239bf8ec 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -288,7 +288,6 @@ lib.makeScope pkgs.newScope ( buildPecl = buildPecl.override { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; - inherit (pkgs) darwin; }; decimal = callPackage ../development/php-packages/decimal { }; @@ -324,9 +323,7 @@ lib.makeScope pkgs.newScope ( memprof = callPackage ../development/php-packages/memprof { }; - mongodb = callPackage ../development/php-packages/mongodb { - inherit (pkgs) darwin; - }; + mongodb = callPackage ../development/php-packages/mongodb { }; msgpack = callPackage ../development/php-packages/msgpack { }; @@ -383,9 +380,7 @@ lib.makeScope pkgs.newScope ( smbclient = callPackage ../development/php-packages/smbclient { }; - snuffleupagus = callPackage ../development/php-packages/snuffleupagus { - inherit (pkgs) darwin; - }; + snuffleupagus = callPackage ../development/php-packages/snuffleupagus { }; spx = callPackage ../development/php-packages/spx { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aaf71e4dcdcd..85b33a8902f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -81,9 +81,7 @@ self: super: with self; { adb-shell = callPackage ../development/python-modules/adb-shell { }; - adblock = callPackage ../development/python-modules/adblock { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + adblock = callPackage ../development/python-modules/adblock { }; add-trailing-comma = callPackage ../development/python-modules/add-trailing-comma { }; @@ -1071,9 +1069,7 @@ self: super: with self; { audioread = callPackage ../development/python-modules/audioread { }; - audiotools = callPackage ../development/python-modules/audiotools { - inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreServices; - }; + audiotools = callPackage ../development/python-modules/audiotools { }; auditok = callPackage ../development/python-modules/auditok { }; @@ -1197,9 +1193,7 @@ self: super: with self; { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; - awscrt = callPackage ../development/python-modules/awscrt { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + awscrt = callPackage ../development/python-modules/awscrt { }; awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { }; @@ -2934,9 +2928,7 @@ self: super: with self; { cryptodatahub = callPackage ../development/python-modules/cryptodatahub { }; - cryptography = callPackage ../development/python-modules/cryptography { - inherit (pkgs.darwin.apple_sdk.frameworks) Security; - }; + cryptography = callPackage ../development/python-modules/cryptography { }; cryptolyzer = callPackage ../development/python-modules/cryptolyzer { }; @@ -2954,9 +2946,7 @@ self: super: with self; { css-html-js-minify = callPackage ../development/python-modules/css-html-js-minify { }; - css-inline = callPackage ../development/python-modules/css-inline { - inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + css-inline = callPackage ../development/python-modules/css-inline { }; css-parser = callPackage ../development/python-modules/css-parser { }; @@ -3170,7 +3160,6 @@ self: super: with self; { datadog = callPackage ../development/python-modules/datadog { }; datafusion = callPackage ../development/python-modules/datafusion { - inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration; protoc = pkgs.protobuf; }; @@ -4513,9 +4502,7 @@ self: super: with self; { ete3 = callPackage ../development/python-modules/ete3 { }; - etebase = callPackage ../development/python-modules/etebase { - inherit (pkgs.darwin.apple_sdk.frameworks) Security; - }; + etebase = callPackage ../development/python-modules/etebase { }; etelemetry = callPackage ../development/python-modules/etelemetry { }; @@ -6014,7 +6001,6 @@ self: super: with self; { gspread = callPackage ../development/python-modules/gspread { }; gssapi = callPackage ../development/python-modules/gssapi { - inherit (pkgs.darwin.apple_sdk.frameworks) GSS; krb5-c = pkgs.krb5; }; @@ -7029,9 +7015,7 @@ self: super: with self; { jobspy = callPackage ../development/python-modules/jobspy { }; - johnnycanencrypt = callPackage ../development/python-modules/johnnycanencrypt { - inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; - }; + johnnycanencrypt = callPackage ../development/python-modules/johnnycanencrypt { }; josepy = callPackage ../development/python-modules/josepy { }; @@ -7624,9 +7608,7 @@ self: super: with self; { ledgercomm = callPackage ../development/python-modules/ledgercomm { }; - ledgerwallet = callPackage ../development/python-modules/ledgerwallet { - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; - }; + ledgerwallet = callPackage ../development/python-modules/ledgerwallet { }; legacy-cgi = callPackage ../development/python-modules/legacy-cgi { }; @@ -8363,9 +8345,7 @@ self: super: with self; { manim-slides = callPackage ../development/python-modules/manim-slides { }; - manimpango = callPackage ../development/python-modules/manimpango { - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; - }; + manimpango = callPackage ../development/python-modules/manimpango { }; manuel = callPackage ../development/python-modules/manuel { }; @@ -8441,7 +8421,6 @@ self: super: with self; { matplotlib = callPackage ../development/python-modules/matplotlib { stdenv = if stdenv.hostPlatform.isDarwin then pkgs.clangStdenv else pkgs.stdenv; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; matplotlib-inline = callPackage ../development/python-modules/matplotlib-inline { }; @@ -8743,7 +8722,6 @@ self: super: with self; { miniaudio = callPackage ../development/python-modules/miniaudio { inherit (pkgs) miniaudio; - inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; }; minichain = callPackage ../development/python-modules/minichain { }; @@ -11366,9 +11344,7 @@ self: super: with self; { primer3 = callPackage ../development/python-modules/primer3 { }; - primp = callPackage ../development/python-modules/primp { - inherit (pkgs.darwin.apple_sdk.frameworks) SystemConfiguration; - }; + primp = callPackage ../development/python-modules/primp { }; print-color = callPackage ../development/python-modules/print-color { }; @@ -11507,7 +11483,6 @@ self: super: with self; { psutil = callPackage ../development/python-modules/psutil { stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; psutil-home-assistant = callPackage ../development/python-modules/psutil-home-assistant { }; @@ -12268,7 +12243,6 @@ self: super: with self; { pygame = callPackage ../development/python-modules/pygame { SDL2_image = pkgs.SDL2_image_2_0; }; pygame-ce = callPackage ../development/python-modules/pygame-ce { - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; SDL2_image = pkgs.SDL2_image_2_0; SDL2_mixer = pkgs.SDL2_mixer_2_0; }; @@ -12712,9 +12686,7 @@ self: super: with self; { pymumble = callPackage ../development/python-modules/pymumble { }; - pymunk = callPackage ../development/python-modules/pymunk { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; - }; + pymunk = callPackage ../development/python-modules/pymunk { }; pymupdf = callPackage ../development/python-modules/pymupdf { }; @@ -14135,14 +14107,7 @@ self: super: with self; { python-roborock = callPackage ../development/python-modules/python-roborock { }; - python-rtmidi = callPackage ../development/python-modules/python-rtmidi { - inherit (pkgs.darwin.apple_sdk.frameworks) - CoreAudio - CoreMIDI - CoreServices - Foundation - ; - }; + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; python-sat = callPackage ../development/python-modules/python-sat { }; @@ -14284,7 +14249,6 @@ self: super: with self; { libXmu libXext ; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; } ); @@ -15221,9 +15185,7 @@ self: super: with self; { rtfunicode = callPackage ../development/python-modules/rtfunicode { }; - rtmidi-python = callPackage ../development/python-modules/rtmidi-python { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices; - }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; rtmixer = callPackage ../development/python-modules/rtmixer { }; @@ -15469,9 +15431,7 @@ self: super: with self; { scrypt = callPackage ../development/python-modules/scrypt { }; - scs = callPackage ../development/python-modules/scs { - inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate; - }; + scs = callPackage ../development/python-modules/scs { }; sdds = callPackage ../development/python-modules/sdds { }; @@ -15830,9 +15790,7 @@ self: super: with self; { skein = callPackage ../development/python-modules/skein { }; - skia-pathops = callPackage ../development/python-modules/skia-pathops { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL; - }; + skia-pathops = callPackage ../development/python-modules/skia-pathops { }; skidl = callPackage ../development/python-modules/skidl { }; @@ -15862,9 +15820,7 @@ self: super: with self; { skytemple-icons = callPackage ../development/python-modules/skytemple-icons { }; - skytemple-rust = callPackage ../development/python-modules/skytemple-rust { - inherit (pkgs.darwin.apple_sdk.frameworks) Foundation; - }; + skytemple-rust = callPackage ../development/python-modules/skytemple-rust { }; skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { }; @@ -17010,7 +16966,6 @@ self: super: with self; { in callPackage ../development/python-modules/tensorflow { inherit (pkgs.config) cudaSupport; - inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers; flatbuffers-python = self.flatbuffers; cudaPackages = compat.cudaPackagesTF; @@ -18202,9 +18157,7 @@ self: super: with self; { ua-parser-rs = callPackage ../development/python-modules/ua-parser-rs { }; - uamqp = callPackage ../development/python-modules/uamqp { - inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork CoreFoundation Security; - }; + uamqp = callPackage ../development/python-modules/uamqp { }; uarray = callPackage ../development/python-modules/uarray { }; @@ -18242,9 +18195,7 @@ self: super: with self; { ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; - uharfbuzz = callPackage ../development/python-modules/uharfbuzz { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; - }; + uharfbuzz = callPackage ../development/python-modules/uharfbuzz { }; uhi = callPackage ../development/python-modules/uhi { }; @@ -18450,9 +18401,7 @@ self: super: with self; { uvicorn = callPackage ../development/python-modules/uvicorn { }; - uvloop = callPackage ../development/python-modules/uvloop { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }; + uvloop = callPackage ../development/python-modules/uvloop { }; uwsgi-chunked = callPackage ../development/python-modules/uwsgi-chunked { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index dabc79018316..6be0612762db 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -198,14 +198,7 @@ makeScopeWithSplicing' { packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; - libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { - inherit (pkgs.darwin.apple_sdk.frameworks) - Accelerate - AGL - Cocoa - Foundation - ; - }; + libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { }; libqglviewer = callPackage ../development/libraries/libqglviewer { }; @@ -262,9 +255,7 @@ makeScopeWithSplicing' { qjson = callPackage ../development/libraries/qjson { }; - qmltermwidget = callPackage ../development/libraries/qmltermwidget { - inherit (pkgs.darwin.apple_sdk.libs) utmp; - }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; @@ -285,7 +276,6 @@ makeScopeWithSplicing' { qtkeychain = callPackage ../development/libraries/qtkeychain { stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; qtmpris = callPackage ../development/libraries/qtmpris { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 30a88e32bdb8..d7f144f0d5df 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -82,7 +82,7 @@ makeScopeWithSplicing' { maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { }; - qca = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/qca { + qca = callPackage ../development/libraries/qca { inherit (qt6) qtbase qt5compat; }; qcoro = callPackage ../development/libraries/qcoro { }; @@ -96,9 +96,7 @@ makeScopeWithSplicing' { qtforkawesome = callPackage ../development/libraries/qtforkawesome { }; - qtkeychain = callPackage ../development/libraries/qtkeychain { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + qtkeychain = callPackage ../development/libraries/qtkeychain { }; qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };