From ff4881996e584d2b8462bef02f37face63ce75a8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 17 Apr 2023 10:02:47 +0300 Subject: [PATCH 1/3] darwin.apple_sdk_10_12.frameworks.System: init --- pkgs/os-specific/darwin/apple-sdk/default.nix | 9 +++++++++ pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 1 + 2 files changed, 10 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 5cf37e8f4026..48c423c98929 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -320,6 +320,15 @@ in rec { ''; }); + System = lib.overrideDerivation super.System (drv: { + installPhase = '' + mkdir -p $out/Library/Frameworks/System.framework/Versions/B + ln -s $out/Library/Frameworks/System.framework/Versions/{B,Current} + ln -s ${pkgs.darwin.Libsystem}/lib/libSystem.B.tbd $out/Library/Frameworks/System.framework/Versions/B/System.tbd + ln -s $out/Library/Frameworks/System.framework/{Versions/Current/,}System.tbd + ''; + }); + WebKit = lib.overrideDerivation super.WebKit (drv: { extraTBDFiles = [ "Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore.tbd" diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 0c70d9bc258f..a9fbcc066a3c 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -104,6 +104,7 @@ with frameworks; with libs; { SpriteKit = {}; StoreKit = {}; SyncServices = {}; + System = {}; SystemConfiguration = { inherit Security; }; TWAIN = { inherit Carbon; }; Tcl = {}; From 13532826524693318930574c2ead977ff66a6a83 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 16 Apr 2023 18:48:22 +0300 Subject: [PATCH 2/3] far2l: remove libSystem hack --- pkgs/applications/misc/far2l/default.nix | 7 ++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 2a23aac79f82..ee17568c0118 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, ninja, pkg-config, m4, bash , xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz -, IOKit, Carbon, Cocoa, AudioToolbox, OpenGL +, IOKit, Carbon, Cocoa, AudioToolbox, OpenGL, System , withTTYX ? true, libX11 , withGUI ? true, wxGTK32 , withUCD ? true, libuchardet @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withNetRocks [ openssl libssh libnfs neon ] ++ lib.optional (withNetRocks && !stdenv.isDarwin) samba # broken on darwin ++ lib.optionals withPython (with python3Packages; [ python cffi debugpy pcpp ]) - ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL ]; + ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ]; postPatch = '' patchShebangs python/src/prebuild.sh @@ -43,9 +43,6 @@ stdenv.mkDerivation rec { --replace '"/bin/bash"' '"${bash}/bin/bash"' substituteInPlace far2l/src/cfg/config.cpp \ --replace '"/bin/bash"' '"${bash}/bin/bash"' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace WinPort/src/Backend/WX/CMakeLists.txt \ - --replace "-framework System" -lSystem ''; cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "yes" else "no"}") { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d97eb416919c..43ca9ca78092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20221,7 +20221,7 @@ with pkgs; far2l = callPackage ../applications/misc/far2l { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL; + inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL System; }; farbfeld = callPackage ../development/libraries/farbfeld { }; From 35bb9e5ac77352bb2c9f7936bfc9a3384f68c2f6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 16 Apr 2023 18:48:36 +0300 Subject: [PATCH 3/3] monit: remove libSystem hack --- pkgs/tools/system/monit/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index a5e0a409ffc9..f1ebd6596c5b 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -24,16 +24,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.DiskArbitration + darwin.apple_sdk.frameworks.System ]; buildInputs = [ zlib.dev libxcrypt ] ++ lib.optionals useSSL [ openssl ] ++ lib.optionals usePAM [ pam ]; - preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure --replace "-framework System" "-lSystem" - ''; - configureFlags = [ (lib.withFeature usePAM "pam") ] ++ (if useSSL then [