public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up xquartz arguments

Browse Source
This commit is contained in:
Jude Taylor 2015-10-28 13:56:13 -07:00
parent de0182ee59
commit c749714170
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/x11/quartz-wm/default.nix
View File

@ -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"; let version = "1.3.1";
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -19,7 +19,7 @@ in stdenv.mkDerivation {
xorg.libXext xorg.libXext
pixman pixman
pkgconfig pkgconfig
Foundation libobjc Xplugin cf-private AppKit Xplugin
]; ];
meta = with lib; { meta = with lib; {
license = licenses.apsl20; license = licenses.apsl20;

3
pkgs/servers/x11/xorg/overrides.nix
View File

@ -332,9 +332,6 @@ in
args.apple_sdk.libs.Xplugin args.apple_sdk.libs.Xplugin
args.apple_sdk.frameworks.Carbon args.apple_sdk.frameworks.Carbon
args.apple_sdk.frameworks.Cocoa args.apple_sdk.frameworks.Cocoa
args.apple_sdk.frameworks.CoreGraphics
args.apple_sdk.frameworks.Foundation
args.cf-private args.libobjc
]; ];
propagatedBuildInputs = commonPropagatedBuildInputs ++ [ propagatedBuildInputs = commonPropagatedBuildInputs ++ [
libAppleWM applewmproto libAppleWM applewmproto

3
pkgs/top-level/all-packages.nix
View File

@ -9447,9 +9447,8 @@ let
xquartz = callPackage ../servers/x11/xquartz { }; xquartz = callPackage ../servers/x11/xquartz { };
quartz-wm = callPackage ../servers/x11/quartz-wm { quartz-wm = callPackage ../servers/x11/quartz-wm {
stdenv = clangStdenv; stdenv = clangStdenv;
inherit (darwin.apple_sdk.frameworks) Foundation; inherit (darwin.apple_sdk.frameworks) AppKit;
inherit (darwin.apple_sdk.libs) Xplugin; inherit (darwin.apple_sdk.libs) Xplugin;
inherit (darwin) libobjc cf-private;
}; };
xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {