|
|
|
@ -9246,14 +9246,19 @@ let |
|
|
|
|
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; |
|
|
|
|
|
|
|
|
|
xquartz = callPackage ../servers/x11/xquartz { }; |
|
|
|
|
quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; |
|
|
|
|
quartz-wm = callPackage ../servers/x11/quartz-wm { |
|
|
|
|
stdenv = clangStdenv; |
|
|
|
|
inherit (darwin.apple_sdk.frameworks) Foundation; |
|
|
|
|
inherit (darwin.apple_sdk.libs) Xplugin; |
|
|
|
|
inherit (darwin) libobjc CF; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { |
|
|
|
|
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig |
|
|
|
|
libxslt expat libpng zlib perl mesa_drivers spice_protocol |
|
|
|
|
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook |
|
|
|
|
autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; |
|
|
|
|
inherit (darwin) apple_sdk; |
|
|
|
|
inherit (darwin) apple_sdk libobjc CF; |
|
|
|
|
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; |
|
|
|
|
mesa = mesa_noglu; |
|
|
|
|
udev = if stdenv.isLinux then udev else null; |
|
|
|
|