From 0c293b2dd7fc3a5458edb2a6d181a56e38c8f642 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 11 Dec 2022 21:54:30 -0300 Subject: [PATCH 1/7] aegisub: incorporate darwin into its expression --- pkgs/applications/video/aegisub/default.nix | 9 ++------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index e77fe067670f..6c267aad77eb 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32801c7cd2a2..6af0f14cbd4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; From e88150faaa3afc1b948300b9f2197b1fe7520439 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 11 Dec 2022 21:56:24 -0300 Subject: [PATCH 2/7] ftgl: incorporate darwin into its expression --- pkgs/development/libraries/ftgl/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 46d6180eb1dc..b6554979c7ee 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6af0f14cbd4e..5c660097a03a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7240,9 +7240,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 { }; From d8e45aef2aa4b9217ead6dcdb9b67bbf76373f44 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 11 Dec 2022 22:20:37 -0300 Subject: [PATCH 3/7] plan9port: incorporate darwin into its expression --- pkgs/tools/system/plan9port/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index b4a277eeec4e..b1f963e807f0 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c660097a03a..cf393d518ec6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10622,10 +10622,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; From 0cbaaf47d5d718be70d40a09b940eb805036a73a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 11 Dec 2022 22:24:04 -0300 Subject: [PATCH 4/7] wxSVG: incorporate darwin into its expression --- pkgs/development/libraries/wxSVG/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index f5672167336e..52f6d679b99f 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf393d518ec6..8194db8fe5e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23165,7 +23165,6 @@ with pkgs; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30; - inherit (darwin.apple_sdk.frameworks) Cocoa; }; wtk = callPackage ../development/libraries/wtk { }; From 7f00403e5f6ae1a743d3f7ddc8ed232403dc6407 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 11 Dec 2022 22:34:51 -0300 Subject: [PATCH 5/7] mpv-unwrapped: incorporate darwin into its expression --- pkgs/applications/video/mpv/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index da5e6366fb61..88204a47365a 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8194db8fe5e7..b03794aece35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30698,7 +30698,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 From d9411df65bea20d202be54a78543c4f868c500ea Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 11 Dec 2022 22:37:18 -0300 Subject: [PATCH 6/7] soundOfSorting: incorporate darwin into its expression --- pkgs/misc/sound-of-sorting/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 4d3aec01439f..d7a2e5d1f5fe 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b03794aece35..537d05cff7a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37344,9 +37344,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; From 568e01e675d136c05c31bda743dcf64d849d63d3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 11 Dec 2022 22:21:24 -0300 Subject: [PATCH 7/7] cmake: incorporate darwin and libsForQt5 into its expression --- .../tools/build-managers/cmake/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 11 ++--------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7f0d94a9f30e..0a1e191ba360 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 537d05cff7a1..02f13335f71a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16933,18 +16933,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 {