diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index b1c8a8d6cc9bf..fce6920e989b6 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -60,6 +60,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
 
   patches = patches fetchpatch;
 
+  appName = "Emacs";            # used by Darwin systems in emacs/wrapper.nix
+
   src = fetchFromSavannah {
     repo = "emacs";
     rev = version;
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index d61f6967c4b81..bc8b23b96ff47 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -51,6 +51,8 @@ let
     if lib.isFunction packagesFun
       then packagesFun self
     else packagesFun;
+
+  appName = emacs.appName or "Emacs";
 in
 
 runCommand
@@ -216,21 +218,21 @@ runCommand
     # Wrap MacOS app
     # this has to pick up resources and metadata
     # to recognize it as an "app"
-    if [ -d "$emacs/Applications/Emacs.app" ]; then
-      mkdir -p $out/Applications/Emacs.app/Contents/MacOS
-      cp -r $emacs/Applications/Emacs.app/Contents/Info.plist \
-            $emacs/Applications/Emacs.app/Contents/PkgInfo \
-            $emacs/Applications/Emacs.app/Contents/Resources \
-            $out/Applications/Emacs.app/Contents
+    if [ -d "$emacs/Applications/${appName}.app" ]; then
+      mkdir -p $out/Applications/${appName}.app/Contents/MacOS
+      cp -r $emacs/Applications/${appName}.app/Contents/Info.plist \
+            $emacs/Applications/${appName}.app/Contents/PkgInfo \
+            $emacs/Applications/${appName}.app/Contents/Resources \
+            $out/Applications/${appName}.app/Contents
 
 
-      substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \
+      substitute ${./wrapper.sh} $out/Applications/${appName}.app/Contents/MacOS/${appName} \
         --subst-var-by bash ${emacs.stdenv.shell} \
         --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
         --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \
         --subst-var-by autoloadExpression "-l cl-loaddefs -l nix-generated-autoload" \
-        --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
-      chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
+        --subst-var-by prog "$emacs/Applications/${appName}.app/Contents/MacOS/${appName}"
+      chmod +x $out/Applications/${appName}.app/Contents/MacOS/${appName}
     fi
 
     mkdir -p $out/share
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 62d171cd0dc6e..0420ec90d1bb8 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nori (2.6.0)
-    octokit (4.24.0)
+    octokit (4.25.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     openssl-ccm (1.2.2)
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index fc579a8c001f9..be0dbfb00bdda 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -5,7 +5,7 @@ let
   # way to select one ore the other setting other than editing the file
   # manually, so we have to duplicate the know how here.
   systemFlags = lib.optionalString stdenv.isDarwin ''
-    CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
+    CFLAGS=-O2
     LDFLAGS=
   '' + lib.optionalString stdenv.isCygwin ''
     CFLAGS="-O2 -Wall -fomit-frame-pointer"