Merge pull request #249212 from Artturin/makewrapperevaler

pkgs/applications/audio/faust/faust2alqt.nix

@@ -2,12 +2,12 @@
 , alsa-lib
 , qtbase
 , writeText
-, makeWrapper
+, buildPackages
 }:
 let
   # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
   wrapBinary = writeText "wrapBinary" ''
-    source ${makeWrapper}/nix-support/setup-hook
+    source ${buildPackages.makeWrapper}/nix-support/setup-hook
     for p in $FILES; do
       workpath=$PWD
       cd -- "$(dirname "$p")"

pkgs/applications/audio/faust/faust2jaqt.nix

@@ -4,13 +4,13 @@
 , libsndfile
 , alsa-lib
 , writeText
-, makeWrapper
+, buildPackages
 , which
 }:
 let
   # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
   wrapBinary = writeText "wrapBinary" ''
-    source ${makeWrapper}/nix-support/setup-hook
+    source ${buildPackages.makeWrapper}/nix-support/setup-hook
     for p in $FILES; do
       workpath=$PWD
       cd -- "$(dirname "$p")"

pkgs/applications/science/math/sage/sage-with-env.nix

@@ -1,6 +1,5 @@
 { stdenv
 , lib
-, makeWrapper
 , sage-env
 , blas
 , lapack
@@ -72,7 +71,7 @@ let
       []
     );
 
-  allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]);
+  allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs);
   transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs ));
   # fix differences between spkg and sage names
   # (could patch sage instead, but this is more lightweight and also works for packages depending on sage)

pkgs/development/tools/build-managers/sbt/scala-native.nix

@@ -1,13 +1,9 @@
 { lib, sbt, makeWrapper, boehmgc, libunwind, re2, llvmPackages, zlib }:
 
-sbt.overrideDerivation(old: {
-  nativeBuildInputs = [ makeWrapper ];
+sbt.overrideAttrs(previousAttrs: {
+  nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ makeWrapper ];
 
-  version = "0.13.16";
-
-  sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2";
-
-  postFixup = ''
+  postFixup = (previousAttrs.postFixup or "") + ''
     wrapProgram $out/bin/sbt \
       --set CLANG_PATH      "${llvmPackages.clang}/bin/clang" \
       --set CLANGPP_PATH    "${llvmPackages.clang}/bin/clang" \

pkgs/top-level/all-packages.nix

@@ -13751,7 +13751,9 @@ with pkgs;
 
   tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { };
 
-  tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
+  tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins {
+    pkgs = pkgs.__splicedPackages;
+  });
 
   tmsu = callPackage ../tools/filesystems/tmsu { };
 
@@ -16211,6 +16213,7 @@ with pkgs;
 
   idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {
     idris-no-deps = haskellPackages.idris;
+    pkgs = pkgs.__splicedPackages;
   });
 
   idris = idrisPackages.with-packages [ idrisPackages.base ] ;