movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

treewide: remove references to deprecated darwin.libobjc stub

Browse source 
This was done with booxter’s fantastic [nix-clean-apple_sdk] tool,
simply modified to look for `libobjc` rather than the existing list he
already used in <https://github.com/NixOS/nixpkgs/pull/398707>. Some
manual work was applied, including cleaning up a string interpolation
in the terrifying MacVim derivation, stray comments, empty lists,
function parameters, and `inherit`s, including all of the references in
`all-packages.nix`.

[nix-clean-apple_sdk]: https://github.com/booxter/nix-clean-apple_sdk
This commit is contained in:
Emily 2025-04-20 16:20:50 +01:00
parent 2f32b6190a
commit 954bb3bb03
46 changed files with 132 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/blockchains/optimism/geth.nix
View file

@ -1,9 +1,7 @@
{ {
stdenv,
lib, lib,
buildGoModule, buildGoModule,
fetchFromGitHub, fetchFromGitHub,
libobjc,
}: }:
buildGoModule rec { buildGoModule rec {
@ -35,11 +33,6 @@ buildGoModule rec {
vendorHash = "sha256-pcIydpKWZt3vwShwzGlPKGq+disdxYFOB8gxHou3mVU="; vendorHash = "sha256-pcIydpKWZt3vwShwzGlPKGq+disdxYFOB8gxHou3mVU=";
# Fix for usb-related segmentation faults on darwin
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"

4
pkgs/applications/editors/lapce/default.nix
View file

@ -13,7 +13,6 @@
gtk3, gtk3,
openssl, openssl,
libGL, libGL,
libobjc,
libxkbcommon, libxkbcommon,
wrapGAppsHook3, wrapGAppsHook3,
wayland, wayland,
@ -77,9 +76,6 @@ rustPlatform.buildRustPackage rec {
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
fontconfig fontconfig
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
]; ];
postInstall = postInstall =

5
pkgs/applications/editors/vim/full.nix
View file

@ -30,8 +30,6 @@
makeWrapper, makeWrapper,
wrapGAppsHook3, wrapGAppsHook3,
libobjc,
features ? "huge", # One of tiny, small, normal, big or huge features ? "huge", # One of tiny, small, normal, big or huge
wrapPythonDrv ? false, wrapPythonDrv ? false,
guiSupport ? config.vim.gui or (if stdenv.hostPlatform.isDarwin then "gtk2" else "gtk3"), guiSupport ? config.vim.gui or (if stdenv.hostPlatform.isDarwin then "gtk2" else "gtk3"),
@ -190,9 +188,6 @@ stdenv.mkDerivation {
] ]
++ lib.optional (guiSupport == "gtk2") gtk2-x11 ++ lib.optional (guiSupport == "gtk2") gtk2-x11
++ lib.optional (guiSupport == "gtk3") gtk3-x11 ++ lib.optional (guiSupport == "gtk3") gtk3-x11
++ lib.optionals darwinSupport [
libobjc
]
++ lib.optional luaSupport lua ++ lib.optional luaSupport lua
++ lib.optional pythonSupport python3 ++ lib.optional pythonSupport python3
++ lib.optional tclSupport tcl ++ lib.optional tclSupport tcl

1
pkgs/applications/editors/vim/macvim.nix
View file

@ -150,7 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
postConfigure = '' postConfigure = ''
substituteInPlace src/auto/config.mk \ substituteInPlace src/auto/config.mk \
--replace " -L${stdenv.cc.libc}/lib" "" \ --replace " -L${stdenv.cc.libc}/lib" "" \
--replace " -L${darwin.libobjc}/lib" "" \
--replace " -L${darwin.libunwind}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \
--replace " -L${libiconv}/lib" "" --replace " -L${libiconv}/lib" ""

2
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -13,7 +13,6 @@
pkg-config, pkg-config,
libgcrypt, libgcrypt,
cmake, cmake,
libobjc,
libresolv, libresolv,
libiconv, libiconv,
asciidoctor, # manpages asciidoctor, # manpages
@ -150,7 +149,6 @@ stdenv.mkDerivation rec {
libgcrypt libgcrypt
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
libresolv libresolv
] ]
++ lib.concatMap (p: p.buildInputs) enabledPlugins ++ lib.concatMap (p: p.buildInputs) enabledPlugins

13
pkgs/applications/radio/soapyairspy/default.nix
View file

@ -5,7 +5,6 @@
cmake, cmake,
airspy, airspy,
soapysdr, soapysdr,
libobjc,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,14 +19,10 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = buildInputs = [
[ airspy
airspy soapysdr
soapysdr ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];

13
pkgs/applications/radio/soapybladerf/default.nix
View file

@ -6,7 +6,6 @@
pkg-config, pkg-config,
libbladeRF, libbladeRF,
soapysdr, soapysdr,
libobjc,
}: }:
let let
@ -28,14 +27,10 @@ stdenv.mkDerivation {
cmake cmake
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ libbladeRF
libbladeRF soapysdr
soapysdr ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];

13
pkgs/applications/radio/soapyhackrf/default.nix
View file

@ -6,7 +6,6 @@
pkg-config, pkg-config,
hackrf, hackrf,
soapysdr, soapysdr,
libobjc,
}: }:
let let
@ -28,14 +27,10 @@ stdenv.mkDerivation {
cmake cmake
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ hackrf
hackrf soapysdr
soapysdr ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];

13
pkgs/applications/radio/soapyrtlsdr/default.nix
View file

@ -6,7 +6,6 @@
pkg-config, pkg-config,
rtl-sdr, rtl-sdr,
soapysdr, soapysdr,
libobjc,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -24,14 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
cmake cmake
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ rtl-sdr
rtl-sdr soapysdr
soapysdr ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];

15
pkgs/applications/radio/soapyuhd/default.nix
View file

@ -7,7 +7,6 @@
uhd, uhd,
boost, boost,
soapysdr, soapysdr,
libobjc,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,15 +24,11 @@ stdenv.mkDerivation rec {
cmake cmake
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ uhd
uhd boost
boost soapysdr
soapysdr ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];

81
pkgs/applications/science/math/R/default.nix
View file

@ -33,7 +33,6 @@
blas, blas,
lapack, lapack,
curl, curl,
libobjc,
tzdata, tzdata,
withRecommendedPackages ? true, withRecommendedPackages ? true,
enableStrictBarrier ? false, enableStrictBarrier ? false,
@ -74,48 +73,44 @@ stdenv.mkDerivation (finalAttrs: {
tzdata tzdata
which which
]; ];
buildInputs = buildInputs = [
[ bzip2
bzip2 gfortran
gfortran libX11
libX11 libXmu
libXmu libXt
libXt libXt
libXt libjpeg
libjpeg libpng
libpng libtiff
libtiff ncurses
ncurses pango
pango pcre2
pcre2 readline
readline (texliveSmall.withPackages (
(texliveSmall.withPackages ( ps: with ps; [
ps: with ps; [ inconsolata
inconsolata helvetic
helvetic ps.texinfo
ps.texinfo fancyvrb
fancyvrb cm-super
cm-super rsfs
rsfs ]
] ))
)) xz
xz zlib
zlib less
less texinfo
texinfo graphviz
graphviz icu
icu which
which blas
blas lapack
lapack curl
curl tcl
tcl tk
tk jdk
jdk ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
strictDeps = true; strictDeps = true;
patches = [ patches = [

2
pkgs/applications/virtualization/xhyve/default.nix
View file

@ -2,7 +2,6 @@
stdenv, stdenv,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
libobjc,
zlib, zlib,
}: }:
@ -18,7 +17,6 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
libobjc
zlib zlib
]; ];

4
pkgs/by-name/bo/bochs/package.nix
View file

@ -2,7 +2,6 @@
lib, lib,
SDL2, SDL2,
curl, curl,
darwin,
docbook_xml_dtd_45, docbook_xml_dtd_45,
docbook_xsl, docbook_xsl,
fetchurl, fetchurl,
@ -62,9 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
libGLU libGLU
libX11 libX11
libXpm libXpm
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
]; ];
configureFlags = configureFlags =

2
pkgs/by-name/gn/gn/generic.nix
View file

@ -1,7 +1,6 @@
{ {
stdenv, stdenv,
lib, lib,
darwin,
fetchgit, fetchgit,
fetchpatch, fetchpatch,
cctools, cctools,
@ -55,7 +54,6 @@ stdenv.mkDerivation {
python3 python3
]; ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
cctools cctools
]; ];

7
pkgs/by-name/go/go-ethereum/package.nix
View file

@ -1,9 +1,7 @@
{ {
lib, lib,
stdenv,
buildGoModule, buildGoModule,
fetchFromGitHub, fetchFromGitHub,
libobjc,
nixosTests, nixosTests,
}: }:
@ -58,11 +56,6 @@ buildGoModule rec {
# Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.6/build/ci.go#L218 # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.6/build/ci.go#L218
tags = [ "urfave_cli_no_docs" ]; tags = [ "urfave_cli_no_docs" ];
# Fix for usb-related segmentation faults on darwin
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
passthru.tests = { inherit (nixosTests) geth; }; passthru.tests = { inherit (nixosTests) geth; };
meta = with lib; { meta = with lib; {

6
pkgs/by-name/ha/handbrake/package.nix
View file

@ -58,8 +58,6 @@
libdvdnav, libdvdnav,
libdvdcss, libdvdcss,
libbluray, libbluray,
# Darwin-specific
darwin,
# GTK # GTK
# NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus,
# which in turn depends on systemd. systemd is not supported on Darwin, so # which in turn depends on systemd. systemd is not supported on Darwin, so
@ -87,7 +85,6 @@
}: }:
let let
inherit (darwin) libobjc;
version = "1.9.2"; version = "1.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -290,9 +287,6 @@ let
udev udev
] ]
++ optional useFdk fdk_aac ++ optional useFdk fdk_aac
++ optionals stdenv.hostPlatform.isDarwin [
libobjc
]
# NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only,
# look at ./make/configure.py search "enable_nvenc" # look at ./make/configure.py search "enable_nvenc"
++ optional stdenv.hostPlatform.isLinux nv-codec-headers; ++ optional stdenv.hostPlatform.isLinux nv-codec-headers;

13
pkgs/by-name/li/libfreefare/package.nix
View file

@ -6,7 +6,6 @@
pkg-config, pkg-config,
libnfc, libnfc,
openssl, openssl,
darwin,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -22,14 +21,10 @@ stdenv.mkDerivation {
autoreconfHook autoreconfHook
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ libnfc
libnfc openssl
openssl ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
];
env = { env = {
NIX_CFLAGS_COMPILE = toString [ NIX_CFLAGS_COMPILE = toString [

13
pkgs/by-name/li/libui-ng/package.nix
View file

@ -2,7 +2,6 @@
lib, lib,
stdenv, stdenv,
cmocka, cmocka,
darwin,
fetchFromGitHub, fetchFromGitHub,
gtk3, gtk3,
meson, meson,
@ -33,15 +32,9 @@ stdenv.mkDerivation {
pkg-config pkg-config
]; ];
buildInputs = buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
if stdenv.hostPlatform.isDarwin then gtk3
[ ];
darwin.libobjc
]
else
[
gtk3
];
mesonFlags = [ mesonFlags = [
(lib.mesonBool "examples" (!stdenv.hostPlatform.isDarwin)) (lib.mesonBool "examples" (!stdenv.hostPlatform.isDarwin))

19
pkgs/by-name/mo/movit/package.nix
View file

@ -6,7 +6,6 @@
SDL2, SDL2,
fftw, fftw,
gtest, gtest,
darwin,
eigen, eigen,
libepoxy, libepoxy,
libGL, libGL,
@ -33,17 +32,13 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ SDL2
SDL2 fftw
fftw gtest
gtest libGL
libGL libX11
libX11 ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
];
propagatedBuildInputs = [ propagatedBuildInputs = [
eigen eigen

4
pkgs/by-name/oc/oculante/package.nix
View file

@ -16,7 +16,6 @@
wayland, wayland,
stdenv, stdenv,
gtk3, gtk3,
darwin,
perl, perl,
wrapGAppsHook3, wrapGAppsHook3,
}: }:
@ -57,9 +56,6 @@ rustPlatform.buildRustPackage rec {
gtk3 gtk3
libxkbcommon libxkbcommon
wayland wayland
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
]; ];
checkFlags = [ checkFlags = [

15
pkgs/by-name/sd/SDL2_Pango/package.nix
View file

@ -2,7 +2,6 @@
lib, lib,
SDL2, SDL2,
autoreconfHook, autoreconfHook,
darwin,
fetchFromGitHub, fetchFromGitHub,
freetype, freetype,
pango, pango,
@ -27,15 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ SDL2
SDL2 freetype
freetype pango
pango ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
];
outputs = [ outputs = [
"out" "out"

11
pkgs/by-name/sd/SDL2_gfx/package.nix
View file

@ -1,7 +1,6 @@
{ {
lib, lib,
SDL2, SDL2,
darwin,
fetchurl, fetchurl,
pkg-config, pkg-config,
stdenv, stdenv,
@ -25,13 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ SDL2
SDL2 ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
];
outputs = [ outputs = [
"out" "out"

5
pkgs/by-name/sd/SDL2_net/package.nix
View file

@ -1,7 +1,6 @@
{ {
lib, lib,
SDL2, SDL2,
darwin,
fetchFromGitHub, fetchFromGitHub,
pkg-config, pkg-config,
stdenv, stdenv,
@ -30,10 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config pkg-config
]; ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
];
propagatedBuildInputs = [ SDL2 ]; propagatedBuildInputs = [ SDL2 ];
configureFlags = [ configureFlags = [

4
pkgs/by-name/sd/SDL2_ttf/package.nix
View file

@ -1,7 +1,6 @@
{ {
lib, lib,
SDL2, SDL2,
darwin,
fetchurl, fetchurl,
freetype, freetype,
harfbuzz, harfbuzz,
@ -35,9 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
] ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
libGL libGL
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
]; ];
configureFlags = [ configureFlags = [

3
pkgs/by-name/sm/smpeg2/package.nix
View file

@ -3,7 +3,6 @@
stdenv, stdenv,
autoconf, autoconf,
automake, automake,
darwin,
fetchFromGitHub, fetchFromGitHub,
makeWrapper, makeWrapper,
pkg-config, pkg-config,
@ -28,7 +27,7 @@ stdenv.mkDerivation {
pkg-config pkg-config
]; ];
buildInputs = [ SDL2 ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.libobjc; buildInputs = [ SDL2 ];
outputs = [ outputs = [
"out" "out"

17
pkgs/by-name/so/soapyplutosdr/package.nix
View file

@ -4,7 +4,6 @@
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
pkg-config, pkg-config,
darwin,
libad9361, libad9361,
libiio, libiio,
libusb1, libusb1,
@ -26,16 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
cmake cmake
pkg-config pkg-config
]; ];
buildInputs = buildInputs = [
[ libad9361
libad9361 libiio
libiio libusb1
libusb1 soapysdr
soapysdr ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];

2
pkgs/development/compilers/mono/4.nix
View file

@ -1,12 +1,10 @@
{ {
callPackage, callPackage,
libobjc,
stdenv, stdenv,
lib, lib,
}: }:
callPackage ./generic.nix { callPackage ./generic.nix {
inherit libobjc;
version = "4.8.1.0"; version = "4.8.1.0";
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645 enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645

2
pkgs/development/compilers/mono/5.nix
View file

@ -1,10 +1,8 @@
{ {
callPackage, callPackage,
libobjc,
}: }:
callPackage ./generic.nix { callPackage ./generic.nix {
inherit libobjc;
version = "5.20.1.34"; version = "5.20.1.34";
sha256 = "12vw5dkhmp1vk9l658pil8jiqirkpdsc5z8dm5mpj595yr6d94fd"; sha256 = "12vw5dkhmp1vk9l658pil8jiqirkpdsc5z8dm5mpj595yr6d94fd";
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/development/compilers/mono/6.nix
View file

@ -1,10 +1,8 @@
{ {
callPackage, callPackage,
libobjc,
}: }:
callPackage ./generic.nix { callPackage ./generic.nix {
inherit libobjc;
version = "6.12.0.182"; version = "6.12.0.182";
srcArchiveSuffix = "tar.xz"; srcArchiveSuffix = "tar.xz";
sha256 = "sha256-VzZqarTztezxEdSFSAMWFbOhANuHxnn8AG6Mik79lCQ="; sha256 = "sha256-VzZqarTztezxEdSFSAMWFbOhANuHxnn8AG6Mik79lCQ=";

23
pkgs/development/compilers/mono/generic.nix
View file

@ -13,7 +13,6 @@
zlib, zlib,
bash, bash,
cacert, cacert,
libobjc,
python3, python3,
version, version,
sha256, sha256,
@ -51,19 +50,15 @@ stdenv.mkDerivation rec {
which which
gnumake42 gnumake42
]; ];
buildInputs = buildInputs = [
[ glib
glib gettext
gettext libgdiplus
libgdiplus libX11
libX11 ncurses
ncurses zlib
zlib bash
bash ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
configureFlags = [ configureFlags = [
"--x-includes=${libX11.dev}/include" "--x-includes=${libX11.dev}/include"

6
pkgs/development/compilers/terra/default.nix
View file

@ -10,7 +10,6 @@
cudaPackages, cudaPackages,
enableCUDA ? false, enableCUDA ? false,
libffi, libffi,
libobjc,
libpfm, libpfm,
}: }:
@ -63,10 +62,7 @@ stdenv.mkDerivation rec {
libxml2 libxml2
] ]
++ lib.optionals enableCUDA [ cuda ] ++ lib.optionals enableCUDA [ cuda ]
++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm;
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
cmakeFlags = cmakeFlags =
let let

6
pkgs/development/haskell-modules/configuration-darwin.nix
View file

@ -165,12 +165,6 @@ self: super:
# http://openradar.appspot.com/10207999 and similar issues. # http://openradar.appspot.com/10207999 and similar issues.
fsnotify = dontCheck super.fsnotify; fsnotify = dontCheck super.fsnotify;
FractalArt = overrideCabal (drv: {
librarySystemDepends = [
darwin.libobjc
] ++ (drv.librarySystemDepends or [ ]);
}) super.FractalArt;
HTF = overrideCabal (drv: { HTF = overrideCabal (drv: {
# GNU find is not prefixed in stdenv # GNU find is not prefixed in stdenv
postPatch = postPatch =

3
pkgs/development/interpreters/ruby/default.nix
View file

@ -17,7 +17,6 @@
bison, bison,
autoconf, autoconf,
libiconv, libiconv,
libobjc,
libunwind, libunwind,
buildEnv, buildEnv,
bundler, bundler,
@ -120,7 +119,6 @@ let
bundler, bundler,
bundix, bundix,
libiconv, libiconv,
libobjc,
libunwind, libunwind,
makeBinaryWrapper, makeBinaryWrapper,
buildRubyGem, buildRubyGem,
@ -183,7 +181,6 @@ let
++ op (!cursesSupport && stdenv.hostPlatform.isDarwin) readline ++ op (!cursesSupport && stdenv.hostPlatform.isDarwin) readline
++ ops stdenv.hostPlatform.isDarwin [ ++ ops stdenv.hostPlatform.isDarwin [
libiconv libiconv
libobjc
libunwind libunwind
]; ];
propagatedBuildInputs = op jemallocSupport jemalloc; propagatedBuildInputs = op jemallocSupport jemalloc;

2
pkgs/development/interpreters/spidermonkey/common.nix
View file

@ -27,7 +27,6 @@
nspr, nspr,
readline, readline,
zlib, zlib,
libobjc,
libiconv, libiconv,
}: }:
@ -98,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: rec {
zlib zlib
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
libiconv libiconv
]; ];

7
pkgs/development/libraries/libftdi/default.nix
View file

@ -3,7 +3,6 @@
stdenv, stdenv,
fetchurl, fetchurl,
libusb-compat-0_1, libusb-compat-0_1,
libobjc,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,11 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii";
}; };
buildInputs = buildInputs = [ libusb-compat-0_1 ];
[ libusb-compat-0_1 ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
propagatedBuildInputs = [ libusb-compat-0_1 ]; propagatedBuildInputs = [ libusb-compat-0_1 ];

4
pkgs/development/libraries/libticalcs2/default.nix
View file

@ -11,7 +11,6 @@
xz, xz,
bzip2, bzip2,
acl, acl,
libobjc,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -38,9 +37,6 @@ stdenv.mkDerivation rec {
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
acl acl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
]; ];
meta = with lib; { meta = with lib; {

7
pkgs/development/libraries/libusb1/default.nix
View file

@ -8,7 +8,6 @@
enableUdev ? enableUdev ?
stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isAndroid, stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isAndroid,
udev, udev,
libobjc,
withExamples ? false, withExamples ? false,
withStatic ? false, withStatic ? false,
withDocs ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, withDocs ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
@ -34,11 +33,7 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
autoreconfHook autoreconfHook
] ++ lib.optionals withDocs [ doxygen ]; ] ++ lib.optionals withDocs [ doxygen ];
propagatedBuildInputs = propagatedBuildInputs = lib.optional enableUdev udev;
lib.optional enableUdev udev
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
dontDisableStatic = withStatic; dontDisableStatic = withStatic;

3
pkgs/development/libraries/qrencode/default.nix
View file

@ -6,7 +6,6 @@
SDL2, SDL2,
libpng, libpng,
libiconv, libiconv,
libobjc,
}: }:
stdenv.mkDerivation (finalAttrs: rec { stdenv.mkDerivation (finalAttrs: rec {
@ -30,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: rec {
buildInputs = [ buildInputs = [
libiconv libiconv
libpng libpng
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ]; ];
nativeCheckInputs = [ SDL2 ]; nativeCheckInputs = [ SDL2 ];

7
pkgs/development/libraries/wiiuse/default.nix
View file

@ -5,7 +5,6 @@
fetchpatch, fetchpatch,
cmake, cmake,
bluez, bluez,
libobjc,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -38,11 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
lib.optionals stdenv.hostPlatform.isLinux [ bluez ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ];

10
pkgs/development/ruby-modules/gem/default.nix
View file

@ -24,7 +24,6 @@
fetchgit, fetchgit,
makeWrapper, makeWrapper,
gitMinimal, gitMinimal,
libobjc,
ruby, ruby,
bundler, bundler,
}@defs: }@defs:
@ -125,12 +124,9 @@ lib.makeOverridable (
++ lib.optionals (type != "gem") [ bundler ] ++ lib.optionals (type != "gem") [ bundler ]
++ nativeBuildInputs; ++ nativeBuildInputs;
buildInputs = buildInputs = [
[ ruby
ruby ] ++ buildInputs;
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ]
++ buildInputs;
#name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}";
name = attrs.name or "${namePrefix}${gemName}-${suffix}"; name = attrs.name or "${namePrefix}${gemName}-${suffix}";

2
pkgs/development/tools/rubyfmt/default.nix
View file

@ -10,7 +10,6 @@
zlib, zlib,
readline, readline,
libiconv, libiconv,
libobjc,
libunwind, libunwind,
libxcrypt, libxcrypt,
libyaml, libyaml,
@ -46,7 +45,6 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
readline readline
libiconv libiconv
libobjc
libunwind libunwind
]; ];

2
pkgs/misc/jackaudio/default.nix
View file

@ -11,7 +11,6 @@
wafHook, wafHook,
# Darwin Dependencies # Darwin Dependencies
aften, aften,
libobjc,
# BSD Dependencies # BSD Dependencies
freebsd, freebsd,
@ -74,7 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
aften aften
libobjc
] ]
++ lib.optionals stdenv.hostPlatform.isFreeBSD [ ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
freebsd.libsysinfo freebsd.libsysinfo

4
pkgs/tools/misc/timidity/default.nix
View file

@ -4,7 +4,6 @@
fetchurl, fetchurl,
nixosTests, nixosTests,
pkg-config, pkg-config,
libobjc,
libjack2, libjack2,
ncurses, ncurses,
alsa-lib, alsa-lib,
@ -45,9 +44,6 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib alsa-lib
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
]
++ lib.optionals enableVorbis [ ++ lib.optionals enableVorbis [
libvorbis libvorbis
]; ];

2
pkgs/tools/security/gpg-tui/default.nix
View file

@ -8,7 +8,6 @@
pkg-config, pkg-config,
python3, python3,
libiconv, libiconv,
libobjc,
libresolv, libresolv,
x11Support ? true, x11Support ? true,
libxcb, libxcb,
@ -47,7 +46,6 @@ rustPlatform.buildRustPackage rec {
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv libiconv
libobjc
libresolv libresolv
]; ];

5
pkgs/tools/security/softhsm/default.nix
View file

@ -4,7 +4,6 @@
fetchurl, fetchurl,
botan2, botan2,
sqlite, sqlite,
libobjc,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,10 +24,6 @@ stdenv.mkDerivation rec {
"--localstatedir=$out/var" "--localstatedir=$out/var"
]; ];
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
];
buildInputs = [ buildInputs = [
botan2 botan2
sqlite sqlite

115
pkgs/top-level/all-packages.nix
View file

@ -2373,7 +2373,7 @@ with pkgs;
glslviewer = callPackage ../development/tools/glslviewer { }; glslviewer = callPackage ../development/tools/glslviewer { };
gpg-tui = callPackage ../tools/security/gpg-tui { gpg-tui = callPackage ../tools/security/gpg-tui {
inherit (darwin) libobjc libresolv; inherit (darwin) libresolv;
}; };
greg = callPackage ../applications/audio/greg { greg = callPackage ../applications/audio/greg {
@ -2430,9 +2430,7 @@ with pkgs;
krill = callPackage ../servers/krill { }; krill = callPackage ../servers/krill { };
lapce = callPackage ../applications/editors/lapce { lapce = callPackage ../applications/editors/lapce { };
inherit (darwin) libobjc;
};
languagetool-rust = callPackage ../tools/text/languagetool-rust { }; languagetool-rust = callPackage ../tools/text/languagetool-rust { };
@ -4224,9 +4222,7 @@ with pkgs;
mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { }; mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { };
op-geth = callPackage ../applications/blockchains/optimism/geth.nix { op-geth = callPackage ../applications/blockchains/optimism/geth.nix { };
inherit (darwin) libobjc;
};
optimism = callPackage ../applications/blockchains/optimism { }; optimism = callPackage ../applications/blockchains/optimism { };
@ -4830,9 +4826,7 @@ with pkgs;
spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
softhsm = callPackage ../tools/security/softhsm { softhsm = callPackage ../tools/security/softhsm { };
inherit (darwin) libobjc;
};
soundkonverter = libsForQt5.soundkonverter; soundkonverter = libsForQt5.soundkonverter;
@ -5236,9 +5230,7 @@ with pkgs;
wlroots = wlroots_0_17; wlroots = wlroots_0_17;
}; };
wiiuse = callPackage ../development/libraries/wiiuse { wiiuse = callPackage ../development/libraries/wiiuse { };
inherit (darwin) libobjc;
};
wring = nodePackages.wring; wring = nodePackages.wring;
@ -6351,19 +6343,11 @@ with pkgs;
mono = mono6; mono = mono6;
mono4 = lowPrio ( mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix { });
callPackage ../development/compilers/mono/4.nix {
inherit (darwin) libobjc;
}
);
mono5 = callPackage ../development/compilers/mono/5.nix { mono5 = callPackage ../development/compilers/mono/5.nix { };
inherit (darwin) libobjc;
};
mono6 = callPackage ../development/compilers/mono/6.nix { mono6 = callPackage ../development/compilers/mono/6.nix { };
inherit (darwin) libobjc;
};
mozart2 = callPackage ../development/compilers/mozart { mozart2 = callPackage ../development/compilers/mozart {
emacs = emacs-nox; emacs = emacs-nox;
@ -6599,9 +6583,7 @@ with pkgs;
# many packages still fail with latest version # many packages still fail with latest version
tbb = tbb_2020_3; tbb = tbb_2020_3;
terra = callPackage ../development/compilers/terra { terra = callPackage ../development/compilers/terra { };
inherit (darwin) libobjc;
};
teyjus = callPackage ../development/compilers/teyjus { teyjus = callPackage ../development/compilers/teyjus {
inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage; inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage;
@ -7181,9 +7163,7 @@ with pkgs;
inherit (ocamlPackages) reason rtop; inherit (ocamlPackages) reason rtop;
buildRubyGem = callPackage ../development/ruby-modules/gem { buildRubyGem = callPackage ../development/ruby-modules/gem { };
inherit (darwin) libobjc;
};
defaultGemConfig = callPackage ../development/ruby-modules/gem-config { defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
inherit (darwin) DarwinTools autoSignDarwinBinariesHook; inherit (darwin) DarwinTools autoSignDarwinBinariesHook;
}; };
@ -7195,13 +7175,11 @@ with pkgs;
solargraph = rubyPackages.solargraph; solargraph = rubyPackages.solargraph;
rubyfmt = callPackage ../development/tools/rubyfmt { rubyfmt = callPackage ../development/tools/rubyfmt { };
inherit (darwin) libobjc;
};
inherit inherit
(callPackage ../development/interpreters/ruby { (callPackage ../development/interpreters/ruby {
inherit (darwin) libobjc libunwind; inherit (darwin) libunwind;
}) })
mkRubyVersion mkRubyVersion
mkRuby mkRuby
@ -7230,15 +7208,9 @@ with pkgs;
inherit inherit
({ ({
spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { };
inherit (darwin) libobjc; spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { };
}; spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix { };
spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix {
inherit (darwin) libobjc;
};
spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix {
inherit (darwin) libobjc;
};
}) })
spidermonkey_91 spidermonkey_91
spidermonkey_115 spidermonkey_115
@ -9413,9 +9385,7 @@ with pkgs;
doCheck = false; doCheck = false;
}; };
libftdi = callPackage ../development/libraries/libftdi { libftdi = callPackage ../development/libraries/libftdi { };
inherit (darwin) libobjc;
};
libgdiplus = callPackage ../development/libraries/libgdiplus { }; libgdiplus = callPackage ../development/libraries/libgdiplus { };
@ -9601,9 +9571,7 @@ with pkgs;
libstatgrab = callPackage ../development/libraries/libstatgrab { }; libstatgrab = callPackage ../development/libraries/libstatgrab { };
libticalcs2 = callPackage ../development/libraries/libticalcs2 { libticalcs2 = callPackage ../development/libraries/libticalcs2 { };
inherit (darwin) libobjc;
};
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
@ -9632,9 +9600,7 @@ with pkgs;
libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { }; libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { };
libusb1 = callPackage ../development/libraries/libusb1 { libusb1 = callPackage ../development/libraries/libusb1 { };
inherit (darwin) libobjc;
};
libunicode = callPackage ../by-name/li/libunicode/package.nix { libunicode = callPackage ../by-name/li/libunicode/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv;
@ -10388,19 +10354,13 @@ with pkgs;
scheme = guile; scheme = guile;
}; };
soapyairspy = callPackage ../applications/radio/soapyairspy { soapyairspy = callPackage ../applications/radio/soapyairspy { };
inherit (darwin) libobjc;
};
soapyaudio = callPackage ../applications/radio/soapyaudio { }; soapyaudio = callPackage ../applications/radio/soapyaudio { };
soapybladerf = callPackage ../applications/radio/soapybladerf { soapybladerf = callPackage ../applications/radio/soapybladerf { };
inherit (darwin) libobjc;
};
soapyhackrf = callPackage ../applications/radio/soapyhackrf { soapyhackrf = callPackage ../applications/radio/soapyhackrf { };
inherit (darwin) libobjc;
};
soapysdr = callPackage ../applications/radio/soapysdr { }; soapysdr = callPackage ../applications/radio/soapysdr { };
@ -10418,13 +10378,9 @@ with pkgs;
]; ];
}; };
soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr { soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr { };
inherit (darwin) libobjc;
};
soapyuhd = callPackage ../applications/radio/soapyuhd { soapyuhd = callPackage ../applications/radio/soapyuhd { };
inherit (darwin) libobjc;
};
sofia_sip = callPackage ../development/libraries/sofia-sip { }; sofia_sip = callPackage ../development/libraries/sofia-sip { };
@ -10920,7 +10876,6 @@ with pkgs;
R = callPackage ../applications/science/math/R { R = callPackage ../applications/science/math/R {
# TODO: split docs into a separate output # TODO: split docs into a separate output
withRecommendedPackages = false; withRecommendedPackages = false;
inherit (darwin) libobjc;
}; };
rWrapper = callPackage ../development/r-modules/wrapper.nix { rWrapper = callPackage ../development/r-modules/wrapper.nix {
@ -13591,9 +13546,7 @@ with pkgs;
q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; q4wine = libsForQt5.callPackage ../applications/misc/q4wine { };
qrencode = callPackage ../development/libraries/qrencode { qrencode = callPackage ../development/libraries/qrencode { };
inherit (darwin) libobjc;
};
googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
@ -15232,9 +15185,7 @@ with pkgs;
timeshift-minimal timeshift-minimal
; ;
timidity = callPackage ../tools/misc/timidity { timidity = callPackage ../tools/misc/timidity { };
inherit (darwin) libobjc;
};
tiny = callPackage ../applications/networking/irc/tiny { }; tiny = callPackage ../applications/networking/irc/tiny { };
@ -15348,11 +15299,7 @@ with pkgs;
} }
); );
vim-full = vimUtils.makeCustomizable ( vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix { });
callPackage ../applications/editors/vim/full.nix {
inherit (darwin) libobjc;
}
);
vim-darwin = vim-darwin =
(vim-full.override { (vim-full.override {
@ -15549,7 +15496,6 @@ with pkgs;
wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
weechat-unwrapped = callPackage ../applications/networking/irc/weechat { weechat-unwrapped = callPackage ../applications/networking/irc/weechat {
inherit (darwin) libobjc;
inherit (darwin) libresolv; inherit (darwin) libresolv;
guile = guile_3_0; guile = guile_3_0;
}; };
@ -15807,10 +15753,6 @@ with pkgs;
fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { }; fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { };
go-ethereum = callPackage ../by-name/go/go-ethereum/package.nix {
inherit (darwin) libobjc;
};
gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research { gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research {
boost = boost179; boost = boost179;
}; };
@ -17433,7 +17375,6 @@ with pkgs;
jack2 = callPackage ../misc/jackaudio { jack2 = callPackage ../misc/jackaudio {
libopus = libopus.override { withCustomModes = true; }; libopus = libopus.override { withCustomModes = true; };
inherit (darwin) libobjc;
}; };
libjack2 = jack2.override { prefix = "lib"; }; libjack2 = jack2.override { prefix = "lib"; };
@ -17931,9 +17872,7 @@ with pkgs;
openssl = openssl_1_1; openssl = openssl_1_1;
}; };
xhyve = callPackage ../applications/virtualization/xhyve { xhyve = callPackage ../applications/virtualization/xhyve { };
inherit (darwin) libobjc;
};
xsane = callPackage ../applications/graphics/sane/xsane.nix { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { };