diff --git a/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h b/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h
diff --git a/pkgs/servers/x11/xorg/darwin/function-pointer-test.patch b/pkgs/servers/x11/xorg/darwin/function-pointer-test.patch
diff --git a/pkgs/servers/x11/xorg/darwin/private-extern.patch b/pkgs/servers/x11/xorg/darwin/private-extern.patch
diff --git a/pkgs/servers/x11/xorg/darwin/stub.patch b/pkgs/servers/x11/xorg/darwin/stub.patch
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (args) stdenv makeWrapper;
-  inherit (stdenv) lib isDarwin;
+  inherit (stdenv) lib;
   inherit (lib) overrideDerivation;
 
   setMalloc0ReturnsNullCrossCompiling = ''
@@ -49,12 +49,8 @@ in
     inherit (xorg) xorgcffiles;
     x11BuildHook = ./imake.sh;
     patches = [./imake.patch];
-    setupHook = if stdenv.isDarwin then ./darwin-imake-setup-hook.sh else null;
-    CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\\\"${if stdenv.isDarwin
-      then "${args.tradcpp}/bin/cpp"
-      else "gcc"}\\\""
+    CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\"gcc\""
     ];
-    tradcpp = if stdenv.isDarwin then args.tradcpp else null;
   };
 
   mkfontdir = attrs: attrs // {
@@ -89,20 +85,15 @@ in
         # Remove useless DocBook XML files.
         rm -rf $out/share/doc
       '';
-    CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
+    CPP = stdenv.lib.optionalString stdenv.cc.isClang "clang -E -";
     outputs = [ "out" "man" ];
   };
 
-  libAppleWM = attrs: attrs // {
-    propagatedBuildInputs = [ args.apple_sdk.frameworks.ApplicationServices ];
-  };
+  libAppleWM = attrs: attrs // { };
 
   libXfont = attrs: attrs // {
     propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
     # prevents "misaligned_stack_error_entering_dyld_stub_binder"
-    configureFlags = lib.optionals isDarwin [
-      "CFLAGS=-O0"
-    ];
   };
 
   libXxf86vm = attrs: attrs // {
@@ -122,7 +113,7 @@ in
       sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
     '';
     propagatedBuildInputs = [ xorg.libSM ];
-    CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
+    CPP = stdenv.lib.optionalString stdenv.cc.isClang "clang -E -";
     outputs = [ "out" "doc" "man" ];
   };
 
@@ -288,21 +279,7 @@ in
       ];
       # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316
       commonPatches = [ ./xorgserver-xkbcomp-path.patch ./fix_segfault.patch ];
-      # XQuartz requires two compilations: the first to get X / XQuartz,
-      # and the second to get Xvfb, Xnest, etc.
-      darwinOtherX = overrideDerivation xorgserver (oldAttrs: {
-        configureFlags = oldAttrs.configureFlags ++ [
-          "--disable-xquartz"
-          "--enable-xorg"
-          "--enable-xvfb"
-          "--enable-xnest"
-          "--enable-kdrive"
-        ];
-        postInstall = ":"; # prevent infinite recursion
-      });
-    in
-      if (!isDarwin)
-      then {
+    in  {
         buildInputs = [ makeWrapper ] ++ commonBuildInputs;
         propagatedBuildInputs = [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           args.udev
@@ -323,54 +300,6 @@ in
             --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
         '';
         passthru.version = version; # needed by virtualbox guest additions
-      } else {
-        buildInputs = commonBuildInputs ++ [
-          args.bootstrap_cmds args.automake args.autoconf
-        ];
-        propagatedBuildInputs = commonPropagatedBuildInputs ++ [
-          libAppleWM applewmproto
-        ];
-        # Patches can be pulled from the server-*-apple branches of:
-        # http://cgit.freedesktop.org/~jeremyhu/xserver/
-        patches = commonPatches ++ [
-          ./darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch
-          ./darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
-          ./darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
-          ./darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
-          ./darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
-          ./darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
-          ./darwin/private-extern.patch
-          ./darwin/bundle_main.patch
-          ./darwin/stub.patch
-          ./darwin/function-pointer-test.patch
-        ];
-        configureFlags = [
-          # note: --enable-xquartz is auto
-          "CPPFLAGS=-I${./darwin/dri}"
-          "--with-default-font-path="
-          "--with-apple-application-name=XQuartz"
-          "--with-apple-applications-dir=\${out}/Applications"
-          "--with-bundle-id-prefix=org.nixos.xquartz"
-          "--with-sha1=CommonCrypto"
-        ];
-        __impureHostDeps = ["/System/Library" "/usr"];
-        NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include";
-        NIX_CFLAGS_LINK = "-L/usr/lib";
-        preConfigure = ''
-          ensureDir $out/Applications
-          export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
-        '';
-        postInstall = ''
-          rm -fr $out/share/X11/xkb/compiled
-          ln -s /var/tmp $out/share/X11/xkb/compiled
-
-          cp -rT ${darwinOtherX}/bin $out/bin
-          rm -f $out/bin/X
-          ln -s Xquartz $out/bin/X
-
-          cp ${darwinOtherX}/share/man -rT $out/share/man
-        '' ;
-        passthru.version = version;
       });
 
   lndir = attrs: attrs // {
@@ -394,17 +323,12 @@ in
   };
 
   xinit = attrs: attrs // {
-    stdenv = if isDarwin then args.clangStdenv else stdenv;
-    buildInputs = attrs.buildInputs ++ lib.optional isDarwin args.bootstrap_cmds;
+    stdenv = if stdenv.cc.isClang then args.clangStdenv else stdenv;
+    buildInputs = attrs.buildInputs;
     configureFlags = [
       "--with-xserver=${xorg.xorgserver}/bin/X"
-    ] ++ lib.optionals isDarwin [
-      "--with-bundle-id-prefix=org.nixos.xquartz"
-      "--with-launchdaemons-dir=\${out}/LaunchDaemons"
-      "--with-launchagents-dir=\${out}/LaunchAgents"
     ];
-    propagatedBuildInputs = [ xorg.xauth ]
-                         ++ lib.optionals isDarwin [ xorg.libX11 xorg.xproto ];
+    propagatedBuildInputs = [ xorg.xauth ];
     prePatch = ''
       sed -i 's|^defaultserverargs="|&-logfile \"$HOME/.xorg.log\"|p' startx.cpp
     '';

diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
diff --git a/pkgs/servers/x11/xquartz/X11 b/pkgs/servers/x11/xquartz/X11
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
diff --git a/pkgs/servers/x11/xquartz/font_cache b/pkgs/servers/x11/xquartz/font_cache
diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist b/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist
diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist b/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist
diff --git a/pkgs/servers/x11/xquartz/patch_plist.rb b/pkgs/servers/x11/xquartz/patch_plist.rb
diff --git a/pkgs/servers/x11/xquartz/privileged b/pkgs/servers/x11/xquartz/privileged
diff --git a/pkgs/servers/x11/xquartz/startx b/pkgs/servers/x11/xquartz/startx
diff --git a/pkgs/servers/x11/xquartz/system-fonts.nix b/pkgs/servers/x11/xquartz/system-fonts.nix
diff --git a/pkgs/servers/x11/xquartz/xinitrc b/pkgs/servers/x11/xquartz/xinitrc
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
@@ -1,5 +1,13 @@
-{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false
-, locale ? null }:
+{ stdenv, fetchurl
+, readlineSupport ? false
+  , readline
+}:
+
+with {
+  inherit (stdenv.lib)
+    optional
+    wtFlag;
+};
 
 stdenv.mkDerivation rec {
   name = "gawk-4.1.3";
@@ -9,42 +17,21 @@ stdenv.mkDerivation rec {
     sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3";
   };
 
-  doCheck = !(
-       stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
-    || stdenv.isDarwin # XXX: `locale' segfaults
-  );
-
-  buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
-    ++ stdenv.lib.optional readlineSupport readline
-    ++ stdenv.lib.optional stdenv.isDarwin locale;
+  buildInputs = optional readlineSupport readline;
 
-  configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
-    ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}"
-      # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv)
-    ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline";
+  configureFlags = [
+    (wtFlag "readline" readlineSupport "${readline}")
+  ];
 
   postInstall = "rm $out/bin/gawk-*";
 
-  meta = {
-    homepage = http://www.gnu.org/software/gawk/;
-    description = "GNU implementation of the Awk programming language";
-
-    longDescription = ''
-      Many computer users need to manipulate text files: extract and then
-      operate on data from parts of certain lines while discarding the rest,
-      make changes in various text files wherever certain patterns appear,
-      and so on.  To write a program to do these things in a language such as
-      C or Pascal is a time-consuming inconvenience that may take many lines
-      of code.  The job is easy with awk, especially the GNU implementation:
-      Gawk.
-
-      The awk utility interprets a special-purpose programming language that
-      makes it possible to handle many data-reformatting jobs with just a few
-      lines of code.
-    '';
-
-    license = stdenv.lib.licenses.gpl3Plus;
+  doCheck = true;
+  enableParallelBuilding = true;
 
+  meta = with stdenv.lib; {
+    description = "GNU implementation of the Awk programming language";
+    homepage = http://www.gnu.org/software/gawk/;
+    license = licenses.gpl3Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -654,12 +654,6 @@ let
 
   oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
 
-  reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
-
-  setfile = callPackage ../os-specific/darwin/setfile { };
-
-  install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };
-
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   titaniumenv = callPackage ../development/mobile/titaniumenv {
@@ -766,7 +760,7 @@ let
   brasero = callPackage ../tools/cd-dvd/brasero { };
 
   brltty = callPackage ../tools/misc/brltty {
-    alsaSupport = (!stdenv.isDarwin);
+    alsaSupport = true;
   };
   bro = callPackage ../applications/networking/ids/bro { };
 
@@ -1580,9 +1574,7 @@ let
 
   garmintools = callPackage ../development/libraries/garmintools {};
 
-  gawk = callPackage ../tools/text/gawk {
-    locale = darwin.adv_cmds;
-  };
+  gawk = callPackage ../tools/text/gawk { };
 
   gawkInteractive = appendToName "interactive"
     (gawk.override { readlineSupport = true; });
@@ -2050,29 +2042,18 @@ let
   ninka = callPackage ../development/tools/misc/ninka { };
 
   nodejs-4_1 = callPackage ../development/web/nodejs/v4_1_0.nix {
-    libtool = darwin.cctools;
     libuv = libuvVersions.v1_7_5;
-    openssl = openssl_1_0_2;
   };
 
-  nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
-    libtool = darwin.cctools;
-    inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
-  };
+  nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { };
 
-  nodejs = if stdenv.system == "armv5tel-linux" then
-    nodejs-0_10
-  else
-    nodejs-4_1;
+  nodejs = nodejs-4_1;
 
   nodePackages_4_1 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_1; nodejs = nodejs-4_1; });
 
   #nodePackages_0_10 = recurcallPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
 
-  nodePackages = if stdenv.system == "armv5tel-linux" then
-    nodePackages_0_10
-  else
-    nodePackages_4_1;
+  nodePackages = nodePackages_4_1;
 
   npm2nix = nodePackages.npm2nix;
 
@@ -3781,7 +3762,6 @@ let
   gccCrossStageStatic = let
     libcCross1 =
       if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers
-      else if stdenv.cross.libc == "libSystem" then darwin.xcode
       else null;
     in wrapGCCCross {
       gcc = forceNativeDrv (gcc.cc.override {
@@ -3865,7 +3845,7 @@ let
     inherit noSysDirs;
 
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
-    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+    profiledCompiler = with stdenv; (isi686 || isx86_64);
 
     # When building `gcc.crossDrv' (a "Canadian cross", with host == target
     # and host != build), `cross' must be null but the cross-libc must still
@@ -3880,7 +3860,7 @@ let
     inherit noSysDirs;
 
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
-    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+    profiledCompiler = with stdenv; (isi686 || isx86_64);
 
     # When building `gcc.crossDrv' (a "Canadian cross", with host == target
     # and host != build), `cross' must be null but the cross-libc must still
@@ -3897,7 +3877,7 @@ let
     inherit noSysDirs;
 
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
-    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+    profiledCompiler = with stdenv; (isi686 || isx86_64);
 
     # When building `gcc.crossDrv' (a "Canadian cross", with host == target
     # and host != build), `cross' must be null but the cross-libc must still
@@ -3908,8 +3888,7 @@ let
     isl = isl_0_14;
   }));
 
-  gfortran = if !stdenv.isDarwin then gfortran49
-             else callPackage ../development/compilers/gcc/gfortran-darwin.nix {};
+  gfortran = gfortran49;
 
   gfortran48 = wrapCC (gcc48.cc.override {
     name = "gfortran";
@@ -4741,9 +4720,7 @@ let
   sdcc = callPackage ../development/compilers/sdcc { };
 
   smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
-  smlnj = if stdenv.isDarwin
-            then callPackage ../development/compilers/smlnj { }
-            else callPackage_i686 ../development/compilers/smlnj { };
+  smlnj = callPackage_i686 ../development/compilers/smlnj { };
 
   sqldeveloper = callPackage ../development/tools/database/sqldeveloper { };
 
@@ -5045,7 +5022,6 @@ let
   };
   python27 = callPackage ../development/interpreters/python/2.7 {
     self = python27;
-    inherit (darwin) CF configd;
   };
   python32 = callPackage ../development/interpreters/python/3.2 {
     self = python32;
@@ -5307,8 +5283,7 @@ let
   });
 
   binutilsCross = assert crossSystem != null; lowPrio (forceNativeDrv (
-    if crossSystem.libc == "libSystem" then darwin.cctools_cross
-    else binutils.override {
+    binutils.override {
       noSysDirs = true;
       cross = crossSystem;
     }));
@@ -5393,15 +5368,8 @@ let
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
-  cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix {
-    wantPS = stdenv.isDarwin;
-    ps     = null;
-  };
-
-  cmake = callPackage ../development/tools/build-managers/cmake {
-    wantPS = stdenv.isDarwin;
-    ps     = null;
-  };
+  cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { };
+  cmake = callPackage ../development/tools/build-managers/cmake { };
 
   cmakeCurses = cmake.override { useNcurses = true; };
 
@@ -5478,7 +5446,6 @@ let
 
   doxygen = callPackage ../development/tools/documentation/doxygen {
     qt4 = null;
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
   doxygen_gui = lowPrio (doxygen.override { inherit qt4; });
@@ -6300,8 +6267,6 @@ let
   # We can choose:
   libcCrossChooser = name: if name == "glibc" then glibcCross
     else if name == "uclibc" then uclibcCross
-    else if name == "msvcrt" then windows.mingw_w64
-    else if name == "libSystem" then darwin.xcode
     else throw "Unknown libc";
 
   libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
@@ -6671,9 +6636,7 @@ let
 
   kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
 
-  krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {
-    inherit (darwin) bootstrap_cmds;
-  };
+  krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { };
   libkrb5 = krb5Full.override { type = "lib"; };
 
   LASzip = callPackage ../development/libraries/LASzip { };
@@ -7367,11 +7330,9 @@ let
 
   liburcu = callPackage ../development/libraries/liburcu { };
 
-  libusb = callPackage ../development/libraries/libusb {};
+  libusb = callPackage ../development/libraries/libusb { };
 
-  libusb1 = callPackage ../development/libraries/libusb1 {
-    inherit (darwin) libobjc IOKit;
-  };
+  libusb1 = callPackage ../development/libraries/libusb1 { };
 
   libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
 
@@ -7381,7 +7342,6 @@ let
 
   libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv {
     automake = automake113x; # fails with 14
-    inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
   });
 
   libuv = libuvVersions.v1_7_5;
@@ -9325,8 +9285,6 @@ let
       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 libobjc CF;
-    bootstrap_cmds = null;
     mesa = mesa_noglu;
     udev = if stdenv.isLinux then udev else null;
     libdrm = if stdenv.isLinux then libdrm else null;
@@ -9444,43 +9402,6 @@ let
 
   cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
 
-  darwin = let
-    cmdline = callPackage ../os-specific/darwin/command-line-tools {};
-    apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
-  in apple-source-releases // rec {
-    cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) {
-      cross = assert crossSystem != null; crossSystem;
-      inherit maloader;
-      xctoolchain = xcode.toolchain;
-    };
-
-    cctools = (callPackage ../os-specific/darwin/cctools/port.nix { inherit libobjc; }).native;
-
-    maloader = callPackage ../os-specific/darwin/maloader {
-      inherit opencflite;
-    };
-
-    opencflite = callPackage ../os-specific/darwin/opencflite {};
-
-    xcode = callPackage ../os-specific/darwin/xcode {};
-
-    osx_sdk = callPackage ../os-specific/darwin/osx-sdk {};
-    osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {};
-
-    security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool { };
-
-    binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };
-
-    cmdline_sdk   = cmdline.sdk;
-    cmdline_tools = cmdline.tools;
-
-    apple_sdk = callPackage ../os-specific/darwin/apple-sdk {
-      inherit (darwin) CF;
-    };
-
-    libobjc = apple-source-releases.objc4;
-  };
-
   devicemapper = lvm2;
 
   disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
@@ -11069,8 +10990,6 @@ let
     imagemagick = null;
     acl = null;
     gpm = null;
-    inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
-    inherit (darwin) libobjc;
   };
 
   emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {
@@ -11079,17 +10998,6 @@ let
     withGTK3 = false;
   }));
 
-  emacs24Macport_24_3 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.3.nix {
-    stdenv = pkgs.clangStdenv;
-  });
-  emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix {
-    stdenv = pkgs.clangStdenv;
-  });
-  emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix {
-    stdenv = pkgs.clangStdenv;
-  });
-  emacs24Macport = self.emacs24Macport_24_5;
-
   emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;
 
@@ -12009,7 +11917,6 @@ let
 
   mercurial = callPackage ../applications/version-management/mercurial {
     inherit (pythonPackages) curses docutils hg-git dulwich;
-    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
     guiSupport = false; # use mercurialFull to get hgk GUI
   };
 
@@ -12965,12 +12872,7 @@ let
     flup = pythonPackages.flup;
   };
 
-  vim = callPackage ../applications/editors/vim {
-    inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
-    inherit (darwin) libobjc;
-  };
-
-  macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; };
+  vim = callPackage ../applications/editors/vim { };
 
   vimHugeX = vim_configurable;
 
@@ -13074,9 +12976,7 @@ let
     graphicsSupport = false;
   };
 
-  weechat = callPackage ../applications/networking/irc/weechat {
-    inherit (darwin) libobjc;
-  };
+  weechat = callPackage ../applications/networking/irc/weechat { };
 
   westonLite = callPackage ../applications/window-managers/weston {
     pango = null;
@@ -14651,7 +14551,7 @@ let
 
   ghostscript = callPackage ../misc/ghostscript {
     x11Support = false;
-    cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin);
+    cupsSupport = config.ghostscript.cups or true;
   };
 
   ghostscriptX = appendToName "with-X" (ghostscript.override {