diff --git a/hosts/common/programs/bemenu.nix b/hosts/common/programs/bemenu.nix
index 8f4a8b7e..2292e55d 100644
--- a/hosts/common/programs/bemenu.nix
+++ b/hosts/common/programs/bemenu.nix
@@ -95,7 +95,7 @@ in
 
     packageUnwrapped = pkgs.bemenu.overrideAttrs (upstream: {
       nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
-        pkgs.makeWrapper
+        pkgs.makeBinaryWrapper
       ];
       # can alternatively be specified as CLI flags
       postInstall = (upstream.postInstall or "") + ''
diff --git a/hosts/common/programs/s6-rc.nix b/hosts/common/programs/s6-rc.nix
index f29f7068..6143a14f 100644
--- a/hosts/common/programs/s6-rc.nix
+++ b/hosts/common/programs/s6-rc.nix
@@ -3,7 +3,7 @@
   sane.programs.s6-rc = {
     packageUnwrapped = pkgs.s6-rc.overrideAttrs (upstream: {
       nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ (with pkgs; [
-        makeWrapper
+        makeBinaryWrapper
       ]);
       # s6-rc looks for files in /run/s6/{live,compiled,...} by default.
       # let's patch that to be a user-specific runtime dir, since i run it as an ordinary user.
diff --git a/pkgs/additional/blast-ugjka/default.nix b/pkgs/additional/blast-ugjka/default.nix
index 1473804c..d6a1f55d 100644
--- a/pkgs/additional/blast-ugjka/default.nix
+++ b/pkgs/additional/blast-ugjka/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule
 , fetchFromGitHub
 , lib
-, makeWrapper
+, makeBinaryWrapper
 , nix-update-script
 , pulseaudio
 }:
@@ -19,7 +19,7 @@ buildGoModule rec {
   vendorHash = "sha256-yPwLilMiDR1aSeuk8AEmuYPsHPRWqiByGLwgkdI5t+s=";
 
   nativeBuildInputs = [
-    makeWrapper
+    makeBinaryWrapper
   ];
 
   postInstall = ''
diff --git a/pkgs/additional/gpodder-configured/default.nix b/pkgs/additional/gpodder-configured/default.nix
index f1767445..2b093de5 100644
--- a/pkgs/additional/gpodder-configured/default.nix
+++ b/pkgs/additional/gpodder-configured/default.nix
@@ -20,7 +20,9 @@ in
 (symlinkJoin {
   name = "${gpodder.pname}-configured";
   paths = [ gpodder remove-extra ];
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+  ];
 
   # gpodder keeps all its feeds in a sqlite3 database.
   # we can configure the feeds externally by wrapping gpodder and just instructing it to import
diff --git a/pkgs/additional/koreader-from-src/default.nix b/pkgs/additional/koreader-from-src/default.nix
index 6048496c..4583cb59 100644
--- a/pkgs/additional/koreader-from-src/default.nix
+++ b/pkgs/additional/koreader-from-src/default.nix
@@ -36,7 +36,7 @@
 , git
 , libtool
 , luajit
-, makeWrapper
+, makeBinaryWrapper
 , pkg-config
 , stdenv
 , symlinkJoin
@@ -482,7 +482,7 @@ stdenv.mkDerivation rec {
     cmake  # for koreader/base submodule
     git
     libtool
-    makeWrapper
+    makeBinaryWrapper
     pkg-config
   ];
   buildInputs = [
diff --git a/pkgs/additional/static-nix-shell/default.nix b/pkgs/additional/static-nix-shell/default.nix
index 5ff053cf..c9aaeddc 100644
--- a/pkgs/additional/static-nix-shell/default.nix
+++ b/pkgs/additional/static-nix-shell/default.nix
@@ -1,10 +1,11 @@
-{ pkgs
-, bash
-, lib
-, makeWrapper
-, python3
-, stdenv
-, zsh
+{
+  pkgs,
+  bash,
+  lib,
+  makeBinaryWrapper,
+  python3,
+  stdenv,
+  zsh,
 }:
 
 let
@@ -76,19 +77,21 @@ in rec {
     # allow any package to be a list of packages, to support things like
     # -p python3.pkgs.foo.propagatedBuildInputs
     pkgsEnv' = lib.flatten pkgsEnv;
-    doWrap = pkgsEnv' != [];
+
+    makeWrapperArgs = lib.optionals (pkgsEnv' != []) [
+      "--suffix" "PATH" ":" (lib.makeBinPath pkgsEnv')
+    ] ++ extraMakeWrapperArgs;
+    doWrap = makeWrapperArgs != [];
   in
     stdenv.mkDerivation (final: {
       version = "0.1.0";  # default version
       preferLocalBuild = true;
 
       nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [
-        makeWrapper
+        makeBinaryWrapper
       ];
 
-      makeWrapperArgs = [
-        "--suffix" "PATH" ":" (lib.makeBinPath pkgsEnv')
-      ] ++ extraMakeWrapperArgs;
+      inherit makeWrapperArgs;
 
       patchPhase = ''
         substituteInPlace ${srcPath} \