diff options
| author | Jude Taylor <me@jude.bio> | 2015-10-28 13:56:13 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-28 13:56:13 -0700 |
| commit | c7497141709a9f506874d2501fa8b2f8ed74c8de (patch) | |
| tree | a8d1daa9e2d561a584815c76251a1b05a32864a4 /pkgs/servers | |
| parent | de0182ee597033845fbe479d379f70c0bc126233 (diff) | |
| download | nixlib-c7497141709a9f506874d2501fa8b2f8ed74c8de.tar nixlib-c7497141709a9f506874d2501fa8b2f8ed74c8de.tar.gz nixlib-c7497141709a9f506874d2501fa8b2f8ed74c8de.tar.bz2 nixlib-c7497141709a9f506874d2501fa8b2f8ed74c8de.tar.lz nixlib-c7497141709a9f506874d2501fa8b2f8ed74c8de.tar.xz nixlib-c7497141709a9f506874d2501fa8b2f8ed74c8de.tar.zst nixlib-c7497141709a9f506874d2501fa8b2f8ed74c8de.zip | |
clean up xquartz arguments
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/quartz-wm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 81c63d9d68d5..5c9fe74b2ede 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 a77b7d4439f2..23583f6dfb74 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 |