Merge pull request #130044 from Mindavi/bugfix/makewrapper-fixes

Move makeWrapper to nativeBuildInputs for some packages
This commit is contained in:
Dmitry Kalinkin 2021-07-13 14:23:25 -04:00 committed by GitHub
commit c149772546
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 15 additions and 13 deletions

View file

@ -86,8 +86,7 @@ let
in stdenv.mkDerivation rec {
inherit pname version src;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ jdk11 gradle_5 ];
nativeBuildInputs = [ makeWrapper jdk11 gradle_5 ];
buildPhase = ''
mkdir -p -- ./freeplane/build/emoji/{txt,resources/images}

View file

@ -26,9 +26,9 @@ buildPythonApplication rec {
sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M=";
};
nativeBuildInputs = [ intltool wrapGAppsHook ];
nativeBuildInputs = [ makeWrapper intltool wrapGAppsHook ];
buildInputs = [ makeWrapper distutils_extra ];
buildInputs = [ distutils_extra ];
doCheck = false;

View file

@ -170,7 +170,7 @@ buildStdenv.mkDerivation ({
xorg.pixman yasm libGLU libGL
xorg.xorgproto
xorg.libXdamage
xorg.libXext makeWrapper
xorg.libXext
libevent libstartup_notification /* cairo */
libpng jemalloc glib
nasm icu67 libvpx_1_8
@ -224,6 +224,7 @@ buildStdenv.mkDerivation ({
cargo
gnused
llvmPackages.llvm # llvm-objdump
makeWrapper
nodejs
perl
pkg-config

View file

@ -6,7 +6,7 @@ buildEnv {
name = "zeroad-${zeroad-unwrapped.version}";
inherit (zeroad-unwrapped) meta;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
paths = [ zeroad-unwrapped zeroad-data ];

View file

@ -8,7 +8,7 @@ buildEnv {
(callPackage ./game.nix {})
];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
mkdir -p $out/bin
makeWrapper $out/games/flare $out/bin/flare --run "cd $out/share/games/flare"

View file

@ -12,7 +12,7 @@ in buildEnv {
pathsToLink = [ "/opt" ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
# so we can launch sp from mp game and vice versa
postBuild = ''

View file

@ -18,7 +18,7 @@ buildGoModule rec {
# package does not contain any tests as of v0.2.1
doCheck = false;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/uchess --suffix PATH : ${stockfish}/bin
'';

View file

@ -6,7 +6,7 @@ in symlinkJoin {
name = "brasero-${brasero-original.version}";
paths = [ brasero-original ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/brasero \

View file

@ -5,7 +5,7 @@ symlinkJoin {
paths = [ fcitx fcitx-configtool libsForQt5.fcitx-qt5 ] ++ plugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/fcitx \

View file

@ -1,7 +1,8 @@
{ runCommand, gawk, extensions, makeWrapper }:
runCommand "gawk-with-extensions" {
buildInputs = [ makeWrapper gawk ] ++ extensions;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ gawk ] ++ extensions;
} ''
mkdir -p $out/bin
for i in ${gawk}/bin/*; do

View file

@ -50,7 +50,8 @@ in (buildEnv {
"/tex/generic/config" # make it a real directory for scheme-infraonly
];
buildInputs = [ makeWrapper ] ++ pkgList.extraInputs;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ] ++ pkgList.extraInputs;
# This is set primarily to help find-tarballs.nix to do its job
passthru.packages = pkgList.all;