Merge pull request #205703 from atorres1985-contrib/inherit-darwin-is-bad

treewide: remove `inherit (darwin)`s from all-packages.nix

pkgs/applications/video/aegisub/default.nix

@@ -28,13 +28,6 @@
 , wxGTK
 , zlib
 
-, CoreText
-, CoreFoundation
-, AppKit
-, Carbon
-, IOKit
-, Cocoa
-
 , spellcheckSupport ? true
 , hunspell ? null
 
@@ -51,6 +44,7 @@
 , portaudio ? null
 
 , useBundledLuaJIT ? false
+, darwin
 }:
 
 assert spellcheckSupport -> (hunspell != null);
@@ -62,6 +56,7 @@ assert portaudioSupport -> (portaudio != null);
 let
   luajit52 = luajit.override { enable52Compat = true; };
   inherit (lib) optional;
+  inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa;
 in
 stdenv.mkDerivation rec {
   pname = "aegisub";

pkgs/applications/video/mpv/default.nix

@@ -17,7 +17,6 @@
 , lua
 , libuchardet
 , libiconv
-, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
 , xcbuild
 
 , waylandSupport ? stdenv.isLinux
@@ -75,11 +74,12 @@
 , xineramaSupport    ? stdenv.isLinux, libXinerama
 , xvSupport          ? stdenv.isLinux, libXv
 , zimgSupport        ? true,           zimg
+, darwin
 }:
 
 let
+  inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
   luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
-
 in stdenv.mkDerivation rec {
   pname = "mpv";
   version = "0.35.0";

pkgs/development/libraries/ftgl/default.nix

@@ -5,13 +5,15 @@
 , doxygen
 , freeglut
 , freetype
-, GLUT
 , libGL
 , libGLU
-, OpenGL
 , pkg-config
+, darwin
 }:
 
+let
+  inherit (darwin.apple_sdk.frameworks) OpenGL GLUT;
+in
 stdenv.mkDerivation rec {
   pname = "ftgl";
   version = "2.4.0";

pkgs/development/libraries/wxSVG/default.nix

@@ -7,10 +7,12 @@
 , pango
 , pkg-config
 , wxGTK
-# darwin deps
-, Cocoa
+, darwin
 }:
 
+let
+  inherit (darwin.apple_sdk.frameworks) Cocoa;
+in
 stdenv.mkDerivation rec {
   pname = "wxSVG";
   version = "1.5.24";

pkgs/development/tools/build-managers/cmake/default.nix

@@ -1,37 +1,40 @@
 { lib
 , stdenv
+, fetchurl
 , buildPackages
 , bzip2
 , curlMinimal
 , expat
-, fetchurl
 , libarchive
 , libuv
 , ncurses
 , openssl
 , pkg-config
-, qtbase
+, ps
 , rhash
 , sphinx
 , texinfo
-, wrapQtAppsHook
 , xz
 , zlib
-, SystemConfiguration
-, ps
 , isBootstrap ? false
 , useOpenSSL ? !isBootstrap
 , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
 , uiToolkits ? [] # can contain "ncurses" and/or "qt5"
 , buildDocs ? !(isBootstrap || (uiToolkits == []))
+, darwin
+, libsForQt5
 }:
 
 let
+  inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
+  inherit (libsForQt5) qtbase wrapQtAppsHook;
   cursesUI = lib.elem "ncurses" uiToolkits;
   qt5UI = lib.elem "qt5" uiToolkits;
 in
 # Accepts only "ncurses" and "qt5" as possible uiToolkits
 assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == [];
+# Minimal, bootstrap cmake does not have toolkits
+assert isBootstrap -> (uiToolkits == []);
 stdenv.mkDerivation rec {
   pname = "cmake"
     + lib.optionalString isBootstrap "-boot"

pkgs/misc/sound-of-sorting/default.nix

@@ -1,5 +1,15 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, wxGTK32, Cocoa }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, SDL2
+, wxGTK32
+, darwin
+}:
 
+let
+  inherit (darwin.apple_sdk.frameworks) Cocoa;
+in
 stdenv.mkDerivation {
   pname = "sound-of-sorting";
   version = "unstable-2022-10-12";

pkgs/tools/system/plan9port/default.nix

@@ -1,10 +1,14 @@
 { lib, stdenv, fetchFromGitHub
 , fontconfig, freetype, libX11, libXext, libXt, xorgproto
-, Carbon, Cocoa, IOKit, Metal, QuartzCore, DarwinTools
 , perl # For building web manuals
 , which, ed
+, darwin
 }:
 
+let
+  inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore;
+  inherit (darwin) DarwinTools;
+in
 stdenv.mkDerivation rec {
   pname = "plan9port";
   version = "2022-09-12";

pkgs/top-level/all-packages.nix

@@ -1201,7 +1201,6 @@ with pkgs;
 
   aegisub = callPackage ../applications/video/aegisub ({
     wxGTK = wxGTK32;
-    inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa;
   } // (config.aegisub or {}));
 
   aerc = callPackage ../applications/networking/mailreaders/aerc { };
@@ -7245,9 +7244,7 @@ with pkgs;
   frostwire = callPackage ../applications/networking/p2p/frostwire { };
   frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { };
 
-  ftgl = callPackage ../development/libraries/ftgl {
-    inherit (darwin.apple_sdk.frameworks) OpenGL GLUT;
-  };
+  ftgl = callPackage ../development/libraries/ftgl { };
 
   ftop = callPackage ../os-specific/linux/ftop { };
 
@@ -10629,10 +10626,7 @@ with pkgs;
 
   plantuml-server = callPackage ../tools/misc/plantuml-server { };
 
-  plan9port = callPackage ../tools/system/plan9port {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore;
-    inherit (darwin) DarwinTools;
-  };
+  plan9port = callPackage ../tools/system/plan9port { };
 
   platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { });
   platformio = platformioPackages.platformio-chrootenv;
@@ -16947,18 +16941,11 @@ with pkgs;
 
   ctmg = callPackage ../tools/security/ctmg { };
 
-  cmake = callPackage ../development/tools/build-managers/cmake {
-    inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
-    inherit (libsForQt5) qtbase wrapQtAppsHook;
-  };
+  cmake = callPackage ../development/tools/build-managers/cmake { };
 
+  # can't use override - it triggers infinite recursion
   cmakeMinimal = callPackage ../development/tools/build-managers/cmake {
     isBootstrap = true;
-    qtbase = null;
-    wrapQtAppsHook = null;
-    # There is no SystemConfiguration in bootstrapTools, so this version gets
-    # patched to remove that dependency.
-    SystemConfiguration = null;
   };
 
   cmakeCurses = cmake.override {
@@ -23177,7 +23164,6 @@ with pkgs;
 
   wxSVG = callPackage ../development/libraries/wxSVG {
     wxGTK = wxGTK30;
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
   wtk = callPackage ../development/libraries/wtk { };
@@ -30717,7 +30703,6 @@ with pkgs;
 
   mpv-unwrapped = callPackage ../applications/video/mpv {
     inherit lua;
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
   };
 
   # Wraps without trigerring a rebuild
@@ -37364,9 +37349,7 @@ with pkgs;
 
   soundmodem = callPackage ../applications/radio/soundmodem {};
 
-  soundOfSorting = callPackage ../misc/sound-of-sorting {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
-  };
+  soundOfSorting = callPackage ../misc/sound-of-sorting { };
 
   sourceAndTags = callPackage ../misc/source-and-tags {
     hasktags = haskellPackages.hasktags;