diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index 7cdbaa3b8722b..fe83e71a598f4 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -12,22 +12,6 @@ , libXinerama , libXext , libXcursor -, Foundation -, Cocoa -, Carbon -, CoreServices -, ApplicationServices -, CoreAudio -, CoreMIDI -, AudioToolbox -, Accelerate -, CoreImage -, IOKit -, AudioUnit -, QuartzCore -, WebKit -, DiscRecording -, CoreAudioKit # Enabling JACK requires a JACK server at runtime, no fallback mechanism , withJack ? false, jack @@ -61,11 +45,6 @@ stdenv.mkDerivation rec { "-DADLplug_Jack=${if withJack then "ON" else "OFF"}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ - # "fp.h" file not found - "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers" - ]); - NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ # Framework that JUCE needs which don't get linked properly "-framework CoreAudioKit" @@ -96,23 +75,6 @@ stdenv.mkDerivation rec { libXinerama libXext libXcursor - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - Cocoa - Carbon - CoreServices - ApplicationServices - CoreAudio - CoreMIDI - AudioToolbox - Accelerate - CoreImage - IOKit - AudioUnit - QuartzCore - WebKit - DiscRecording - CoreAudioKit ] ++ lib.optional withJack jack; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix index 61f307edd5554..3857e458864aa 100644 --- a/pkgs/applications/misc/cloak/default.nix +++ b/pkgs/applications/misc/cloak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cloak"; @@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - meta = with lib; { homepage = "https://github.com/evansmurithi/cloak"; description = "Command-line OTP authenticator application"; diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index bc9503d0d106a..e7880a90412f1 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, AppKit , libxcb }: @@ -19,8 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-DMswC+Qp6w7Dcp5YYV4EGWUylv/ouG0ukAdCdDnOA/8="; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; meta = with lib; { homepage = "https://github.com/replydev/cotp"; diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index dc2c62b8ad64c..61108ed73bd9e 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -13,7 +13,6 @@ , mpfr , openblas , readline -, Accelerate , pkg-config }: @@ -39,8 +38,6 @@ stdenv.mkDerivation (finalAttrs: { mpfr openblas readline - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate ]; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index 299ea9fb6ba40..76eb913dbabae 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -2,10 +2,7 @@ fetchFromGitHub, gfold, lib, - libiconv, rustPlatform, - Security, - stdenv, testers, }: @@ -20,16 +17,11 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "sha256-7wTU+yVp/GO1H1MbgZKO0OwqSC2jbHO0lU8aa0tHLTY="; + hash = "sha256-7wTU+yVp/GO1H1MbgZKO0OwqSC2jbHO0lU8aa0tHLTY="; }; cargoHash = "sha256-idzw5dfCCvujvYr7DG0oOzQUIcbACtiIZLoA4MEClzY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security - ]; - passthru.tests.version = testers.testVersion { package = gfold; command = "gfold --version"; diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 8679f2842f9d0..d2f6173bfe955 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-absorb"; @@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0="; postInstall = '' diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index b5dac88164410..b4997b85575b2 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -2,15 +2,12 @@ lib, fetchFromGitHub, git, - libiconv, ncurses, openssl, pkg-config, rustPlatform, sqlite, stdenv, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -28,17 +25,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - ncurses - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - libiconv - ]; + buildInputs = [ + ncurses + openssl + sqlite + ]; postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) '' $out/bin/git-branchless install-man-pages $out/share/man diff --git a/pkgs/applications/version-management/git-cinnabar/default.nix b/pkgs/applications/version-management/git-cinnabar/default.nix index 84a34601d40f9..ab43dc0309120 100644 --- a/pkgs/applications/version-management/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-cinnabar/default.nix @@ -8,8 +8,6 @@ , curl , zlib , zstd -, libiconv -, CoreServices }: stdenv.mkDerivation (finalAttrs: { @@ -35,9 +33,6 @@ stdenv.mkDerivation (finalAttrs: { curl zlib zstd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - CoreServices ]; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 864e233bac22f..0a9121f623eee 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -2,8 +2,6 @@ , stdenv , fetchFromGitHub , rustPlatform -, Security -, SystemConfiguration , installShellFiles }: @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { # attempts to run the program on .git in src which is not deterministic doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security SystemConfiguration - ]; - nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 91061e5ad2e92..1b300f1e21de5 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -1,5 +1,5 @@ { - darwin, + apple-sdk_11, fetchFromGitHub, fetchpatch, # Delete at next version bump. lib, @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgit2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 66a2bae71f46b..5351ede7bfc26 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -3,7 +3,6 @@ , lib , libX11 , stdenv -, darwin }: buildGoModule rec { @@ -19,8 +18,7 @@ buildGoModule rec { vendorHash = "sha256-ENrBJ0XbCfLfzTVZEVtDBjGxupdiLI7USGVImkYWDdY="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa - ++ lib.optional stdenv.hostPlatform.isLinux libX11; + buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11; hardeningEnabled = [ "pie" ]; diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index b072922e732f2..1dc76b3f32378 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , cmake @@ -7,8 +6,6 @@ , pkg-config , libusb1 , openssl -, DarwinTools -, AppKit }: rustPlatform.buildRustPackage rec { @@ -34,9 +31,9 @@ rustPlatform.buildRustPackage rec { # https://github.com/probe-rs/probe-rs/pull/2492 gitMinimal pkg-config - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; + ]; - buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + buildInputs = [ libusb1 openssl ]; checkFlags = [ # require a physical probe diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index f21dfc76a69c5..04dadbcdc25bb 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , runtimeShell +, apple-sdk_11 , cacert , cmake , cmakerc @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cmakerc fmt - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; patches = [ ./change-lock-location.patch diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 848b6fb2f10d0..27d55e1c159f1 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, libgit2 }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, libgit2 }: rustPlatform.buildRustPackage rec { pname = "cocogitto"; @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-yGwGWXME9ZjFJk/3pVDRTa1phG6kd8+YhXe/MxOEdF0="; + hash = "sha256-yGwGWXME9ZjFJk/3pVDRTa1phG6kd8+YhXe/MxOEdF0="; }; cargoHash = "sha256-iS/nRfy63bgo7MeL/5jJ3Vn6S7dG49erIZ+0516YxKM="; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ libgit2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ libgit2 ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cog \ diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/development/tools/database/dynein/default.nix index 1673743484592..d1a31880e54f4 100644 --- a/pkgs/development/tools/database/dynein/default.nix +++ b/pkgs/development/tools/database/dynein/default.nix @@ -1,10 +1,8 @@ { fetchFromGitHub , lib -, Security , openssl , pkg-config , rustPlatform -, stdenv }: rustPlatform.buildRustPackage rec { @@ -15,7 +13,7 @@ rustPlatform.buildRustPackage rec { owner = "awslabs"; repo = "dynein"; rev = "v${version}"; - sha256 = "sha256-QhasTFGOFOjzNKdQtA+eBhKy51O4dFt6vpeIAIOM2rQ="; + hash = "sha256-QhasTFGOFOjzNKdQtA+eBhKy51O4dFt6vpeIAIOM2rQ="; }; # Use system openssl. @@ -27,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; preBuild = '' export OPENSSL_DIR=${lib.getDev openssl} diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 7208dfb869ae2..777088bb7c642 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub , lib -, Security , openssl , pkg-config , protobuf @@ -42,7 +41,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl protobuf - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; preBuild = '' export OPENSSL_DIR=${lib.getDev openssl} diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix index ba795a6ef870b..7ba885234445e 100644 --- a/pkgs/development/tools/perseus-cli/default.nix +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -1,10 +1,8 @@ { lib -, stdenv , rustPlatform , fetchCrate , makeWrapper , wasm-pack -, CoreServices }: rustPlatform.buildRustPackage rec { @@ -19,7 +17,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; postInstall = '' wrapProgram $out/bin/perseus \ diff --git a/pkgs/servers/bindle/default.nix b/pkgs/servers/bindle/default.nix index bfd9b2872bc3e..7655bc31107df 100644 --- a/pkgs/servers/bindle/default.nix +++ b/pkgs/servers/bindle/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, pkg-config, openssl }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "bindle"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; # Tests require a network nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; cargoHash = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0="; diff --git a/pkgs/servers/binserve/default.nix b/pkgs/servers/binserve/default.nix index 3864c7929945f..6ec3c073ac913 100644 --- a/pkgs/servers/binserve/default.nix +++ b/pkgs/servers/binserve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "binserve"; @@ -8,13 +8,9 @@ rustPlatform.buildRustPackage rec { owner = "mufeedvh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s="; + hash = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - ]; - cargoLock.lockFile = ./Cargo.lock; postPatch = '' cp ${./Cargo.lock} Cargo.lock diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index 4c6b178ae37b0..3bc5bc00632c2 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -1,10 +1,8 @@ { lib -, stdenv , fetchFromSourcehut , rustPlatform , installShellFiles , scdoc -, Security , nixosTests , nix-update-script }: @@ -29,8 +27,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles scdoc ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - postInstall = '' scdoc < doc/stargazer.scd > stargazer.1 scdoc < doc/stargazer-ini.scd > stargazer.ini.5 diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/tools/admin/coldsnap/default.nix index 23360dc7f7269..cebf69b70a6a6 100644 --- a/pkgs/tools/admin/coldsnap/default.nix +++ b/pkgs/tools/admin/coldsnap/default.nix @@ -2,8 +2,6 @@ , rustPlatform , fetchFromGitHub , openssl -, stdenv -, Security , pkg-config }: @@ -19,7 +17,7 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-ngkoxybl52zTH4wo+sIUtU8vtzOAp+jU1RyTO2KbCgU="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index 756d7aa1261fb..a853a704b9d3e 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -1,8 +1,6 @@ { lib -, stdenv , fetchFromGitHub , rustPlatform -, Security }: rustPlatform.buildRustPackage rec { @@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dMXaIFc0e6PMYiQrokQoUc1xAVCccE92WzM2fl7tOBQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - # tests run in CI on the source repo doCheck = false; diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index 94efc1af33db3..4f938d7455344 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -6,8 +6,6 @@ , pkg-config , libxcb , openssl - # Darwin dependencies -, AppKit }: rustPlatform.buildRustPackage rec { @@ -32,8 +30,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit ]; postInstall = '' diff --git a/pkgs/tools/misc/eludris/default.nix b/pkgs/tools/misc/eludris/default.nix index 756324c1a8b23..a2dfd52d18cf8 100644 --- a/pkgs/tools/misc/eludris/default.nix +++ b/pkgs/tools/misc/eludris/default.nix @@ -3,8 +3,6 @@ , rustPlatform , openssl , pkg-config -, stdenv -, Security }: rustPlatform.buildRustPackage rec { @@ -22,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p eludris" ]; cargoTestFlags = [ "-p eludris" ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/tools/misc/gh-cal/default.nix index 2e4d05b1c2746..53e5e1d3ee7df 100644 --- a/pkgs/tools/misc/gh-cal/default.nix +++ b/pkgs/tools/misc/gh-cal/default.nix @@ -1,10 +1,8 @@ { lib -, stdenv , fetchCrate , rustPlatform , pkg-config , openssl -, Security }: rustPlatform.buildRustPackage rec { pname = "gh-cal"; @@ -18,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; meta = with lib; { description = "GitHub contributions calender terminal viewer"; diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix index f0d72de83d047..e622d4534adb8 100644 --- a/pkgs/tools/misc/vrc-get/default.nix +++ b/pkgs/tools/misc/vrc-get/default.nix @@ -1,4 +1,4 @@ -{ fetchCrate, installShellFiles, lib, rustPlatform, pkg-config, stdenv, Security, SystemConfiguration, buildPackages }: +{ fetchCrate, installShellFiles, lib, rustPlatform, pkg-config, stdenv, buildPackages }: rustPlatform.buildRustPackage rec { pname = "vrc-get"; @@ -11,8 +11,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-uPx9sujuvBp6wJzzqVlS8Rq1S9Cb2su9/gp4pnNJ9zQ="; # Execute the resulting binary to generate shell completions, using emulation if necessary when cross-compiling. diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix index 08a129090b287..7355cd8332e12 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/tools/networking/edgedb/default.nix @@ -8,9 +8,6 @@ pkg-config, curl, openssl, - Security, - CoreServices, - libiconv, xz, substituteAll, # for passthru.tests: @@ -55,9 +52,6 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - libiconv xz ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15d61c44a95e4..1146c234f1e8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -192,9 +192,7 @@ with pkgs; appimageupdate-qt = appimageupdate.override { withQtUI = true; }; - bindle = callPackage ../servers/bindle { - inherit (darwin.apple_sdk.frameworks) Security; - }; + bindle = callPackage ../servers/bindle { }; stripJavaArchivesHook = makeSetupHook { name = "strip-java-archives-hook"; @@ -239,9 +237,7 @@ with pkgs; beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; - binserve = callPackage ../servers/binserve { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + binserve = callPackage ../servers/binserve { }; bloodhound-py = with python3Packages; toPythonApplication bloodhound-py; @@ -294,26 +290,18 @@ with pkgs; stdenv = clangStdenv; }; - cloak = callPackage ../applications/misc/cloak { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cloak = callPackage ../applications/misc/cloak { }; - cotp = callPackage ../applications/misc/cotp { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + cotp = callPackage ../applications/misc/cotp { }; cope = callPackage ../by-name/co/cope/package.nix { perl = perl538; perlPackages = perl538Packages; }; - cocogitto = callPackage ../development/tools/cocogitto { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cocogitto = callPackage ../development/tools/cocogitto { }; - coldsnap = callPackage ../tools/admin/coldsnap { - inherit (darwin.apple_sdk.frameworks) Security; - }; + coldsnap = callPackage ../tools/admin/coldsnap { }; collision = callPackage ../applications/misc/collision { }; @@ -343,21 +331,15 @@ with pkgs; dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { }; - dynein = callPackage ../development/tools/database/dynein { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dynein = callPackage ../development/tools/database/dynein { }; ebpf-verifier = callPackage ../tools/networking/ebpf-verifier { catch2 = catch2_3; }; - edgedb = callPackage ../tools/networking/edgedb { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + edgedb = callPackage ../tools/networking/edgedb { }; - eludris = callPackage ../tools/misc/eludris { - inherit (darwin.apple_sdk.frameworks) Security; - }; + eludris = callPackage ../tools/misc/eludris { }; enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { }; @@ -373,16 +355,9 @@ with pkgs; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; - probe-rs-tools = callPackage ../by-name/pr/probe-rs-tools/package.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - inherit (darwin) DarwinTools; - }; - mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; }; - prisma-engines = callPackage ../development/tools/database/prisma-engines { - inherit (darwin.apple_sdk.frameworks) Security; - }; + prisma-engines = callPackage ../development/tools/database/prisma-engines { }; protoc-gen-dart = callPackage ../development/tools/protoc-gen-dart { }; @@ -391,7 +366,6 @@ with pkgs; }; vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; fmt = fmt_10; }; @@ -415,9 +389,7 @@ with pkgs; device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { }; - didyoumean = callPackage ../tools/misc/didyoumean { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + didyoumean = callPackage ../tools/misc/didyoumean { }; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; @@ -429,9 +401,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - gretl = callPackage ../applications/science/math/gretl { - inherit (darwin.apple_sdk.frameworks) Accelerate; - }; + gretl = callPackage ../applications/science/math/gretl { }; devShellTools = callPackage ../build-support/dev-shell-tools { }; @@ -528,9 +498,7 @@ with pkgs; opendrop = python3Packages.callPackage ../tools/networking/opendrop { }; - perseus-cli = callPackage ../development/tools/perseus-cli { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + perseus-cli = callPackage ../development/tools/perseus-cli { }; pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { }; @@ -932,7 +900,6 @@ with pkgs; actdiag = with python3.pkgs; toPythonApplication actdiag; adlplug = callPackage ../applications/audio/adlplug { - inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit; jack = libjack2; }; opnplug = adlplug.override { @@ -1002,9 +969,7 @@ with pkgs; auditwheel = with python3Packages; toPythonApplication auditwheel; - awsbck = callPackage ../tools/backup/awsbck { - inherit (darwin.apple_sdk.frameworks) Security; - }; + awsbck = callPackage ../tools/backup/awsbck { }; bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; @@ -1046,9 +1011,7 @@ with pkgs; python3Packages = python311Packages; }); - gh-cal = callPackage ../tools/misc/gh-cal { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gh-cal = callPackage ../tools/misc/gh-cal { }; gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { }; @@ -1125,9 +1088,7 @@ with pkgs; jdk = jdk8; }; - stargazer = callPackage ../servers/gemini/stargazer { - inherit (darwin.apple_sdk.frameworks) Security; - }; + stargazer = callPackage ../servers/gemini/stargazer { }; supermin = callPackage ../tools/virtualization/supermin { ocamlPackages = ocaml-ng.ocamlPackages_4_14; @@ -1156,9 +1117,7 @@ with pkgs; vprof = with python3Packages; toPythonApplication vprof; - vrc-get = callPackage ../tools/misc/vrc-get { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + vrc-get = callPackage ../tools/misc/vrc-get { }; winbox = winbox3; winbox3 = callPackage ../tools/admin/winbox { @@ -1238,15 +1197,9 @@ with pkgs; datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; - debase = callPackage ../by-name/de/debase/package.nix { - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - }; - forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; - gfold = callPackage ../applications/version-management/gfold { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gfold = callPackage ../applications/version-management/gfold { }; gita = python3Packages.callPackage ../applications/version-management/gita { }; @@ -1255,9 +1208,8 @@ with pkgs; }; github-cli = gh; - git-absorb = callPackage ../applications/version-management/git-absorb { - inherit (darwin.apple_sdk.frameworks) Security; - }; + + git-absorb = callPackage ../applications/version-management/git-absorb { }; git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui { inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; @@ -1275,17 +1227,11 @@ with pkgs; git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { }; - git-branchless = callPackage ../applications/version-management/git-branchless { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + git-branchless = callPackage ../applications/version-management/git-branchless { }; - git-cinnabar = callPackage ../applications/version-management/git-cinnabar { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + git-cinnabar = callPackage ../applications/version-management/git-cinnabar { }; - git-cliff = callPackage ../applications/version-management/git-cliff { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + git-cliff = callPackage ../applications/version-management/git-cliff { }; git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;