diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
@@ -63,12 +63,6 @@ composableDerivation {
 
     prePatch = "cd src";
 
-    # if darwin support is enabled, we want to make sure we're not building with
-    # OS-installed python framework
-    patches = stdenv.lib.optionals
-      (stdenv.isDarwin && (config.vim.darwin or true))
-      [ ./python_framework.patch ];
-
     configureFlags
       = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];
 
@@ -88,7 +82,6 @@ composableDerivation {
           '';
         };
       }
-      // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support.
       // edf { name = "xsmp"; } #Disable XSMP session management
       // edf { name = "xsmp_interact"; } #Disable XSMP interaction
       // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter.
@@ -99,10 +92,6 @@ composableDerivation {
         feat = "pythoninterp";
         enable = {
           nativeBuildInputs = [ python ];
-        } // lib.optionalAttrs stdenv.isDarwin {
-          configureFlags
-            = [ "--enable-pythoninterp=yes"
-                "--with-python-config-dir=${python}/lib" ];
         };
       }
 
@@ -111,11 +100,6 @@ composableDerivation {
         feat = "python3interp";
         enable = {
           nativeBuildInputs = [ pkgs.python3 ];
-        } // lib.optionalAttrs stdenv.isDarwin {
-          configureFlags
-            = [ "--enable-python3interp=yes"
-                "--with-python3-config-dir=${pkgs.python3}/lib"
-                "--disable-pythoninterp" ];
         };
       }
 
@@ -156,10 +140,6 @@ composableDerivation {
     cscopeSupport    = config.vim.cscope or true;
     netbeansSupport  = config.netbeans or true; # eg envim is using it
 
-    # by default, compile with darwin support if we're compiling on darwin, but
-    # allow this to be disabled by setting config.vim.darwin to false
-    darwinSupport    = stdenv.isDarwin && (config.vim.darwin or true);
-
     # add .nix filetype detection and minimal syntax highlighting support
     ftNixSupport     = config.vim.ftNix or true;
   };

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig
-
-# apple frameworks
-, CoreServices, CoreData, Cocoa, Foundation, libobjc }:
+}:
 
 stdenv.mkDerivation rec {
   name = "vim-${version}";
@@ -14,16 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "1m34s2hsc5lcish6gmvn2iwaz0k7jc3kg9q4nf30fj9inl7gaybs";
   };
 
-  # this makes maintainers very sad
-  # open source CF doesn't have anything NSArray-related, causing linking errors. the
-  # missing symbol is in system CoreFoundation.
-  NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
-    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
-
   enableParallelBuilding = true;
 
-  buildInputs = [ ncurses pkgconfig ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreData CoreServices Cocoa Foundation libobjc ];
+  buildInputs = [ ncurses pkgconfig ];
   nativeBuildInputs = [ gettext ];
 
   configureFlags = [

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch
diff --git a/pkgs/applications/editors/vim/python_framework.patch b/pkgs/applications/editors/vim/python_framework.patch
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
@@ -21,10 +21,6 @@ composableDerivation {
       inherit sha256;
     };
 
-    # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux
-    # to meta.platforms.unix
-    preConfigure = assert (! stdenv.isDarwin); "";
-
     configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ];
 
     nativeBuildInputs
@@ -43,7 +39,6 @@ composableDerivation {
           '';
         };
       }
-      // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support.
       // edf { name = "xsmp"; } #Disable XSMP session management
       // edf { name = "xsmp_interact"; } #Disable XSMP interaction
       // edf { name = "mzscheme"; } #Include MzScheme interpreter.
@@ -54,10 +49,6 @@ composableDerivation {
         feat = "pythoninterp";
         enable = {
           nativeBuildInputs = [ python ];
-        } // lib.optionalAttrs stdenv.isDarwin {
-          configureFlags
-            = [ "--enable-pythoninterp=yes"
-                "--with-python-config-dir=${python}/lib" ];
         };
       }
 
@@ -97,10 +88,6 @@ composableDerivation {
     cscopeSupport    = config.vim.cscope or false;
     netbeansSupport  = config.netbeans or true; # eg envim is using it
 
-    # by default, compile with darwin support if we're compiling on darwin, but
-    # allow this to be disabled by setting config.vim.darwin to false
-    darwinSupport    = stdenv.isDarwin && (config.vim.darwin or true);
-
     # add .nix filetype detection and minimal syntax highlighting support
     ftNixSupport     = config.vim.ftNix or true;
   };

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
 , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
-, pythonPackages, cmake, makeWrapper, libobjc, libiconv
+, pythonPackages, cmake, makeWrapper, libiconv
 , extraBuildInputs ? [] }:
 
 stdenv.mkDerivation rec {
@@ -12,14 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "0j2ic1c69ksf78wi0cmc4yi5348x6c92g6annsx928sayxqxfgbh";
   };
 
-  cmakeFlags = stdenv.lib.optional stdenv.isDarwin
-    "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib";
-
   buildInputs = 
     [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
       libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
       cmake ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ pythonPackages.pync libobjc ]
     ++ extraBuildInputs;
 
   NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=/etc/ssl/certs/ca-certificates.crt";
@@ -35,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.weechat.org/;
     description = "A fast, light and extensible chat client";
     license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
 , guiSupport ? false, tk ? null, hg-crecord ? null, curses
-, ApplicationServices }:
+}:
 
 let
   version = "3.5.1";
@@ -20,8 +20,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ python makeWrapper docutils unzip ];
 
-  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin ApplicationServices;
-
   makeFlags = "PREFIX=$(out)";
 
   postInstall = (stdenv.lib.optionalString guiSupport
@@ -72,6 +70,6 @@ stdenv.mkDerivation {
     homepage = "http://mercurial.selenic.com/";
     downloadPage = "http://mercurial.selenic.com/release/";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch b/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch
diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch b/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch
diff --git a/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch b/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch
diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch b/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch
diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch b/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch
diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch b/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch
diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch b/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch
diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch b/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch
diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch b/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch
diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch b/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
@@ -8,8 +8,6 @@
 , tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin
 , zlib ? null, zlibSupport ? true
 , expat, libffi
-
-, CF, configd
 }:
 
 assert zlibSupport -> zlib != null;
@@ -44,17 +42,6 @@ let
       ./deterministic-build.patch
 
       ./properly-detect-curses.patch
-    ] ++ optionals stdenv.isCygwin [
-      ./2.5.2-ctypes-util-find_library.patch
-      ./2.5.2-tkinter-x11.patch
-      ./2.6.2-ssl-threads.patch
-      ./2.6.5-export-PySignal_SetWakeupFd.patch
-      ./2.6.5-FD_SETSIZE.patch
-      ./2.6.5-ncurses-abi6.patch
-      ./2.7.3-dbm.patch
-      ./2.7.3-dylib.patch
-      ./2.7.3-getpath-exe-extension.patch
-      ./2.7.3-no-libm.patch
     ];
 
   preConfigure = ''
@@ -66,40 +53,22 @@ let
       for i in Lib/plat-*/regen; do
         substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
       done
-    '' + optionalString stdenv.isDarwin ''
-      substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
     '';
 
   configureFlags = [
     "--enable-shared"
     "--with-threads"
     "--enable-unicode=ucs4"
-  ] ++ optionals stdenv.isCygwin [
-    "--with-system-ffi"
-    "--with-system-expat"
-    "ac_cv_func_bind_textdomain_codeset=yes"
-  ] ++ optionals stdenv.isDarwin [
-    "--disable-toolbox-glue"
   ];
 
-  postConfigure = if stdenv.isCygwin then ''
-    sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),'
-  '' else null;
-
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
     [ bzip2 openssl ]
-    ++ optionals stdenv.isCygwin [ expat libffi ]
     ++ optionals includeModules (
         [ db gdbm ncurses sqlite readline
         ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]
     )
-    ++ optional zlibSupport zlib
-
-    # depend on CF and configd only if purity is an issue
-    # the impure bootstrap compiler can't build CoreFoundation currently. it requires
-    # <mach-o/dyld.h> which is in our pure bootstrapTools, but not in the system headers.
-    ++ optionals (stdenv.isDarwin && !stdenv.cc.nativeLibc) [ CF configd ];
+    ++ optional zlibSupport zlib;
 
   # Build the basic Python interpreter without modules that have
   # external dependencies.
@@ -110,11 +79,10 @@ let
     inherit majorVersion version src patches buildInputs preConfigure
             configureFlags;
 
-    LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+    LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-    NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
     DETERMINISTIC_BUILD = 1;
 
     setupHook = ./setup-hook.sh;
@@ -167,7 +135,7 @@ let
       '';
       license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ];
+      maintainers = with stdenv.lib.maintainers; [ ];
     };
   };
 
@@ -190,9 +158,7 @@ let
       LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
       # non-python gdbm has a libintl dependency on i686-cygwin, not on x86_64-cygwin
-      buildPhase = (if (stdenv.system == "i686-cygwin" && moduleName == "gdbm") then ''
-          sed -i setup.py -e "s:libraries = \['gdbm'\]:libraries = ['gdbm', 'intl']:"
-      '' else '''') + ''
+      buildPhase = ''
           substituteInPlace setup.py --replace 'self.extensions = extensions' \
             'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]'
 
@@ -204,7 +170,7 @@ let
         ''
           dest=$out/lib/${python.libPrefix}/site-packages
           mkdir -p $dest
-          cp -p $(find . -name "*.${if stdenv.isCygwin then "dll" else "so"}") $dest/
+          cp -p $(find . -name "*.so") $dest/
         '';
     };
 
@@ -237,7 +203,7 @@ let
     gdbm = buildInternalPythonModule {
       moduleName = "gdbm";
       internalName = "gdbm";
-      deps = [ gdbm ] ++ stdenv.lib.optional stdenv.isCygwin gettext;
+      deps = [ gdbm ];
     };
 
     sqlite3 = buildInternalPythonModule {
@@ -247,10 +213,10 @@ let
 
   } // optionalAttrs x11Support {
 
-    tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule {
+    tkinter = buildInternalPythonModule {
       moduleName = "tkinter";
       deps = [ tcl tk xlibsWrapper libX11 ];
-    });
+    };
 
   } // {
 

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fixDarwinDylibNames }:
+{ stdenv, fetchurl }:
 
 let
   pname = "icu4c";
@@ -13,13 +13,6 @@ stdenv.mkDerivation {
     sha256 = "0ys5f5spizg45qlaa31j2lhgry0jka2gfha527n4ndfxxz5j4sz1";
   };
 
-  makeFlags = stdenv.lib.optionalString stdenv.isDarwin
-    "CXXFLAGS=-headerpad_max_install_names";
-
-  # FIXME: This fixes dylib references in the dylibs themselves, but
-  # not in the programs in $out/bin.
-  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
-
   postUnpack = ''
     sourceRoot=''${sourceRoot}/source
     echo Source root reset to ''${sourceRoot}
@@ -29,20 +22,14 @@ stdenv.mkDerivation {
     sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
   '';
 
-  configureFlags = "--disable-debug" +
-    stdenv.lib.optionalString stdenv.isDarwin " --enable-rpath";
-
-  # remove dependency on bootstrap-tools in early stdenv build
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
-  '';
+  configureFlags = "--disable-debug";
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Unicode and globalization support library";
     homepage = http://site.icu-project.org/;
-    maintainers = with maintainers; [ raskin urkud ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds
+{ stdenv, fetchurl, pkgconfig, perl, yacc
 
 # Optional Dependencies
 , libedit ? null, readline ? null, ncurses ? null, libverto ? null
@@ -64,9 +64,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75";
   };
 
-  nativeBuildInputs = [ pkgconfig perl yacc ]
-    # Provides the mig command used by the build scripts
-    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
+  nativeBuildInputs = [ pkgconfig perl yacc ];
   buildInputs = [ optOpenssl optLibverto optOpenldap ]
     ++ cryptoInputs ++ tlsInputs ++ lineParserInputs;
 

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev ? null, libobjc, IOKit }:
+{ stdenv, fetchurl, pkgconfig, udev ? null }:
 
 stdenv.mkDerivation rec {
   name = "libusb-1.0.19";
@@ -10,10 +10,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig ];
   propagatedBuildInputs =
-    stdenv.lib.optional stdenv.isLinux udev ++
-    stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+    stdenv.lib.optional stdenv.isLinux udev;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
 
   preFixup = stdenv.lib.optionalString stdenv.isLinux ''
     sed 's,-ludev,-L${udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
@@ -23,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.libusb.info;
     description = "User-space USB library";
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
@@ -1,6 +1,5 @@
 { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
-
-, ApplicationServices, CoreServices }:
+}:
 
 let
   stable = "stable";
@@ -9,8 +8,8 @@ let
   meta = with lib; {
     description = "A multi-platform support library with a focus on asynchronous I/O";
     homepage    = https://github.com/libuv/libuv;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms   = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ ];
+    platforms   = with platforms; linux;
   };
 
   mkName = stability: version:
@@ -29,11 +28,7 @@ let
   mkWithoutAutotools = stability: version: sha256: stdenv.mkDerivation {
     name = mkName stability version;
     src = mkSrc version sha256;
-    buildPhase = lib.optionalString stdenv.isDarwin ''
-      mkdir extrapath
-      ln -s /usr/sbin/dtrace extrapath/dtrace
-      export PATH=$PATH:`pwd`/extrapath
-    '' + ''
+    buildPhase = ''
       mkdir build
       make builddir_name=build
 
@@ -61,8 +56,7 @@ let
   mkWithAutotools = stability: version: sha256: stdenv.mkDerivation {
     name = mkName stability version;
     src = mkSrc version sha256;
-    buildInputs = [ automake autoconf libtool pkgconfig ]
-      ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
+    buildInputs = [ automake autoconf libtool pkgconfig ];
     preConfigure = ''
       LIBTOOLIZE=libtoolize ./autogen.sh
     '';

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch b/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,11 +1,18 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
-, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
+{ stdenv, fetchurl, fetchpatch
+, replace
+, curl
+, expat
+, zlib
+, bzip2
+, libarchive
+, useNcurses ? false
+  , ncurses
+, useQt4 ? false
+  , qt4
 }:
 
 with stdenv.lib;
 
-assert wantPS -> (ps != null);
-
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
@@ -33,20 +40,12 @@ stdenv.mkDerivation rec {
     })] ++
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc. 
-    optional (stdenv ? glibc) ./search-path.patch ++
-    optional (stdenv ? cross) (fetchurl {
-      name = "fix-darwin-cross-compile.patch";
-      url = "http://public.kitware.com/Bug/file_download.php?"
-          + "file_id=4981&type=bug";
-      sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    });
+    optional (stdenv ? glibc) ./search-path.patch;
 
   buildInputs = [ curl expat zlib bzip2 libarchive ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
-  propagatedBuildInputs = optional wantPS ps;
-
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
 
   configureFlags =

diff --git a/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch b/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,13 +1,18 @@
 { stdenv, fetchurl
-, bzip2, curl, expat, libarchive, xz, zlib
-, useNcurses ? false, ncurses, useQt4 ? false, qt4
-, wantPS ? false, ps ? null
+, bzip2
+, curl
+, expat
+, libarchive
+, xz
+, zlib
+, useNcurses ? false
+  , ncurses
+, useQt4 ? false
+  , qt4
 }:
 
 with stdenv.lib;
 
-assert wantPS -> (ps != null);
-
 let
   os = stdenv.lib.optionalString;
   majorVersion = "3.3";
@@ -30,29 +35,21 @@ stdenv.mkDerivation rec {
   patches =
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc.
-    optional (stdenv ? glibc) ./search-path-3.2.patch ++
-    optional (stdenv ? cross) (fetchurl {
-      name = "fix-darwin-cross-compile.patch";
-      url = "http://public.kitware.com/Bug/file_download.php?"
-          + "file_id=4981&type=bug";
-      sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    }) ++ stdenv.lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
+    optional (stdenv ? glibc) ./search-path-3.2.patch;
 
   buildInputs =
     [ bzip2 curl expat libarchive xz zlib ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
-  propagatedBuildInputs = optional wantPS ps;
-
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
 
   configureFlags =
     [ "--docdir=/share/doc/${name}"
       "--mandir=/share/man"
       "--no-system-jsoncpp"
+      "--system-libs"
     ]
-    ++ optional (!stdenv.isCygwin) "--system-libs"
     ++ optional useQt4 "--qt-gui"
     ++ ["--"]
     ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
@@ -73,6 +70,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ttuegel ];
+    maintainers = with stdenv.lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,8 +1,15 @@
-{ stdenv, fetchurl, perl, python, flex, bison, qt4, CoreServices, libiconv }:
+{ stdenv, fetchurl
+, perl
+, python
+, flex
+, bison
+, qt4
+}:
 
 let
   name = "doxygen-1.8.6";
 in
+
 stdenv.mkDerivation {
   inherit name;
 
@@ -19,8 +26,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ perl python flex bison ]
-    ++ stdenv.lib.optional (qt4 != null) qt4
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
+    ++ stdenv.lib.optional (qt4 != null) qt4;
 
   prefixKey = "--prefix ";
 
@@ -45,15 +51,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = "http://doxygen.org/";
     description = "Source code documentation generator tool";
-
-    longDescription = ''
-      Doxygen is a documentation system for C++, C, Java, Objective-C,
-      Python, IDL (CORBA and Microsoft flavors), Fortran, VHDL, PHP,
-      C\#, and to some extent D.  It can generate an on-line
-      documentation browser (in HTML) and/or an off-line reference
-      manual (in LaTeX) from a set of documented source files.
-    '';
-
     maintainers = [stdenv.lib.maintainers.simons];
     platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
   };

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
@@ -1,5 +1,14 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool
+{ stdenv, fetchurl
+, openssl
+, python
+, zlib
+, libuv
+, v8
+, utillinux
+, http-parser
+, pkgconfig
+, runCommand
+, which
 }:
 
 # nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think.
@@ -15,9 +24,8 @@ let
     # disabled system v8 because v8 3.14 no longer receives security fixes
     # we fall back to nodejs' internal v8 copy which receives backports for now
     # inherit v8
-  } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
     inherit http-parser;
-  });
+  };
 
   sharedConfigureFlags = name: [
     "--shared-${name}"
@@ -34,17 +42,15 @@ in stdenv.mkDerivation {
     sha256 = "453005f64ee529f7dcf1237eb27ee2fa2415c49f5c9e7463e8b71fba61c5b408";
   };
 
-  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
+  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [
+    "--without-dtrace" ];
   dontDisableStatic = true;
   prePatch = ''
     patchShebangs .
   '';
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch;
-
   buildInputs = [ python which http-parser zlib libuv openssl python ]
-    ++ (optional stdenv.isLinux utillinux)
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
+    ++ (optional stdenv.isLinux utillinux);
   setupHook = ./setup-hook.sh;
 
   enableParallelBuilding = true;
@@ -55,7 +61,7 @@ in stdenv.mkDerivation {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu maintainers.havvy ];
-    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = [ ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/web/nodejs/no-xcode-4.1.0.patch b/pkgs/development/web/nodejs/no-xcode-4.1.0.patch
diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch
diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
@@ -1,58 +1,67 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares
-, pkgconfig, runCommand, which, libtool
-
-# apple frameworks
-, CoreServices, ApplicationServices, Carbon, Foundation
+{ stdenv, fetchurl
+, openssl
+, python
+, zlib
+, v8
+, utillinux
+, http-parser
+, c-ares
+, pkgconfig
+, runCommand
+, which
 }:
 
+with {
+    inherit (stdenv.lib)
+      concatMap
+      optional
+      optionals
+      maintainers
+      licenses
+      platforms;
+};
+
 let
   version = "0.10.38";
 
   # !!! Should we also do shared libuv?
   deps = {
-    inherit openssl zlib;
+    inherit openssl zlib http-parser;
 
     # disabled system v8 because v8 3.14 no longer receives security fixes
     # we fall back to nodejs' internal v8 copy which receives backports for now
     # inherit v8
-  } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-    inherit http-parser;
-  })
-  // ({ cares = c-ares; });
+  } // ({ cares = c-ares; });
 
   sharedConfigureFlags = name: [
     "--shared-${name}"
     "--shared-${name}-includes=${builtins.getAttr name deps}/include"
     "--shared-${name}-libpath=${builtins.getAttr name deps}/lib"
   ];
+in
 
-  inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   name = "nodejs-${version}";
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
     sha256 = "12xpa9jzry5g0j41908498qqs8v0q6miqkv6mggyzas8bvnshgai";
   };
 
-  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++
-    stdenv.lib.optional stdenv.isDarwin "--without-dtrace";
+  setupHook = ./setup-hook.sh;
 
-  prePatch = ''
+  postPatch = ''
     patchShebangs .
   '';
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch;
+  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
-  '';
-
-  buildInputs = [ python which ]
-    ++ (optional stdenv.isLinux utillinux)
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices ApplicationServices Foundation ];
-  propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ];
-  setupHook = ./setup-hook.sh;
+  buildInputs = [
+    pkgconfig
+    python
+    openssl
+    which
+  ] ++ optional stdenv.isLinux utillinux;
 
   enableParallelBuilding = true;
 
@@ -62,7 +71,7 @@ in stdenv.mkDerivation {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = [ ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/web/nodejs/v4_1_0.nix b/pkgs/development/web/nodejs/v4_1_0.nix
@@ -1,44 +1,60 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool
+{ stdenv, fetchurl
+, openssl
+, python
+, zlib
+, libuv
+, v8
+, utillinux
+, http-parser
+, pkgconfig
+, runCommand
+, which
 }:
 
+with {
+    inherit (stdenv.lib)
+      concatMap
+      optional
+      optionals
+      maintainers
+      licenses
+      platforms;
+};
+
 let
   version = "4.1.0";
 
   deps = {
-    inherit openssl zlib libuv;
+    inherit openssl zlib libuv http-parser;
 
     # disabled system v8 because v8 3.14 no longer receives security fixes
     # we fall back to nodejs' internal v8 copy which receives backports for now
     # inherit v8
-  } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-    inherit http-parser;
-  });
+  };
+in
 
-  inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   name = "nodejs-${version}";
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
     sha256 = "025lqmhvl7xpx1ip97jwkz21a97sw9zb4zi3y7fgfag59vv0ac25";
   };
 
-  configureFlags = map (name: "--shared-${name}") (builtins.attrNames deps) ++ [ "--without-dtrace" ];
-
-  dontDisableStatic = true;
+  setupHook = ./setup-hook.sh;
 
-  prePatch = ''
+  postPatch = ''
     patchShebangs .
   '';
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode-4.1.0.patch;
+  configureFlags = map (name: "--shared-${name}") (builtins.attrNames deps) ++ [
+    "--without-dtrace"
+  ];
 
   buildInputs = [ python which ] ++ (builtins.attrValues deps)
-    ++ optional stdenv.isLinux utillinux
-    ++ optionals stdenv.isDarwin [ openssl libtool ];
-  setupHook = ./setup-hook.sh;
+    ++ optional stdenv.isLinux utillinux;
 
+  dontDisableStatic = true;
   enableParallelBuilding = true;
 
   passthru.interpreterName = "nodejs";
@@ -47,7 +63,7 @@ in stdenv.mkDerivation {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu maintainers.havvy ];
-    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = [ ];
+    platforms = platforms.linux ;
   };
 }
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cfmachport.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/add-cfmachport.patch
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch