diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 81c63d9d68d..5c9fe74b2ed 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, Foundation, libobjc, Xplugin, cf-private }: +{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, AppKit, Xplugin }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ in stdenv.mkDerivation { xorg.libXext pixman pkgconfig - Foundation libobjc Xplugin cf-private + AppKit Xplugin ]; meta = with lib; { license = licenses.apsl20; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a77b7d4439f..23583f6dfb7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -332,9 +332,6 @@ in args.apple_sdk.libs.Xplugin args.apple_sdk.frameworks.Carbon args.apple_sdk.frameworks.Cocoa - args.apple_sdk.frameworks.CoreGraphics - args.apple_sdk.frameworks.Foundation - args.cf-private args.libobjc ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ libAppleWM applewmproto diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04bee38c0d9..3479ba9b8f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9447,9 +9447,8 @@ let xquartz = callPackage ../servers/x11/xquartz { }; quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; - inherit (darwin.apple_sdk.frameworks) Foundation; + inherit (darwin.apple_sdk.frameworks) AppKit; inherit (darwin.apple_sdk.libs) Xplugin; - inherit (darwin) libobjc cf-private; }; xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {