diff options
author | Artturi <Artturin@artturin.com> | 2023-08-20 13:25:00 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-20 13:25:00 +0300 |
commit | 52d8a64da60d53ea8fac7f31a191f4adb9a6e0c8 (patch) | |
tree | 283de7f229a57ff5cb7dd8004bb52b1643ebfc6a /pkgs | |
parent | 13b4e547c60edc376475e7b7fed1237d00e62509 (diff) | |
parent | aae9f2ca22efe20369bfbd74561bbdaa61e5d381 (diff) | |
download | nixlib-52d8a64da60d53ea8fac7f31a191f4adb9a6e0c8.tar nixlib-52d8a64da60d53ea8fac7f31a191f4adb9a6e0c8.tar.gz nixlib-52d8a64da60d53ea8fac7f31a191f4adb9a6e0c8.tar.bz2 nixlib-52d8a64da60d53ea8fac7f31a191f4adb9a6e0c8.tar.lz nixlib-52d8a64da60d53ea8fac7f31a191f4adb9a6e0c8.tar.xz nixlib-52d8a64da60d53ea8fac7f31a191f4adb9a6e0c8.tar.zst nixlib-52d8a64da60d53ea8fac7f31a191f4adb9a6e0c8.zip |
Merge pull request #249212 from Artturin/makewrapperevaler
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/faust/faust2alqt.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faust2jaqt.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/math/sage/sage-with-env.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/sbt/scala-native.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
5 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/applications/audio/faust/faust2alqt.nix index 1d86cc3f6c3f..b12b41763ba5 100644 --- a/pkgs/applications/audio/faust/faust2alqt.nix +++ b/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")" diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 90498c9e3e3a..90b6ca218dd4 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/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")" diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 7632b851773c..378f7e29dd99 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/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) diff --git a/pkgs/development/tools/build-managers/sbt/scala-native.nix b/pkgs/development/tools/build-managers/sbt/scala-native.nix index 70038ed2d3a4..caa9feebb519 100644 --- a/pkgs/development/tools/build-managers/sbt/scala-native.nix +++ b/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" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03f550cb2faa..ceaa6dcb9270 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 ] ; |