From 9e1ff110b5dbccaff96dcf5d459976da2f80e23c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:22:27 +0200 Subject: uchess: move makeWrapper to nativeBuildInputs --- pkgs/games/uchess/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/uchess/default.nix b/pkgs/games/uchess/default.nix index bc2524466cc..cafd7cf5769 100644 --- a/pkgs/games/uchess/default.nix +++ b/pkgs/games/uchess/default.nix @@ -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 ''; -- cgit 1.4.1 From 99e9cc0d403d2fb528a3dc871e6c9659721074bc Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:26:42 +0200 Subject: gawk-with-extensions: move makeWrapper to nativeBuildInputs --- pkgs/tools/text/gawk/gawk-with-extensions.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gawk/gawk-with-extensions.nix b/pkgs/tools/text/gawk/gawk-with-extensions.nix index 751e5181bb5..1b82d798d33 100644 --- a/pkgs/tools/text/gawk/gawk-with-extensions.nix +++ b/pkgs/tools/text/gawk/gawk-with-extensions.nix @@ -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 -- cgit 1.4.1 From a2c69a6ed9524e6743cd53f7439996fa784bf1a4 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:28:12 +0200 Subject: freeplane: move makeWrapper to nativeBuildInputs --- pkgs/applications/misc/freeplane/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/applications/misc/freeplane/default.nix index 0568198f41d..f9c04fedfdd 100644 --- a/pkgs/applications/misc/freeplane/default.nix +++ b/pkgs/applications/misc/freeplane/default.nix @@ -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} -- cgit 1.4.1 From b479f3abcda140e23fb41d41b615d414358c3c74 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:29:05 +0200 Subject: fcitx: move makeWrapper to nativeBuildInputs --- pkgs/tools/inputmethods/fcitx/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix index 28a08e39b22..6e7e71c5713 100644 --- a/pkgs/tools/inputmethods/fcitx/wrapper.nix +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ fcitx fcitx-configtool libsForQt5.fcitx-qt5 ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/fcitx \ -- cgit 1.4.1 From 25be3c82d404f373742540780ef1cf1cd0102010 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:29:50 +0200 Subject: brasero: move makeWrapper to nativeBuildInputs --- pkgs/tools/cd-dvd/brasero/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 8112b0971f3..5371e8d526b 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -6,7 +6,7 @@ in symlinkJoin { name = "brasero-${brasero-original.version}"; paths = [ brasero-original ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/brasero \ -- cgit 1.4.1 From 08ca856305fb6033b149b32fd3a85bdb1897a8ac Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:30:41 +0200 Subject: 0ad: move makeWrapper to nativeBuildInputs --- pkgs/games/0ad/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/games/0ad/wrapper.nix index ca7c8e16e3c..ede151307d5 100644 --- a/pkgs/games/0ad/wrapper.nix +++ b/pkgs/games/0ad/wrapper.nix @@ -6,7 +6,7 @@ buildEnv { name = "zeroad-${zeroad-unwrapped.version}"; inherit (zeroad-unwrapped) meta; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; paths = [ zeroad-unwrapped zeroad-data ]; -- cgit 1.4.1 From 8c70974350e21a0c505805f9bfb04fa7c1d3af34 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:53:43 +0200 Subject: variety: move makeWrapper to nativeBuildInputs --- pkgs/applications/misc/variety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 5e7765a16fd..9b40c4c44f1 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -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; -- cgit 1.4.1 From facdb727a051e3ea45dfee9af4c5bc3555762417 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:55:53 +0200 Subject: flare: move makeWrapper to nativeBuildInputs --- pkgs/games/flare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 3ecade9b97e..b0d5f634135 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -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" -- cgit 1.4.1 From ab559bd8231f620ff268e22d0938b88d828f6963 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:56:44 +0200 Subject: iortcw: move makeWrapper to nativeBuildInputs --- pkgs/games/iortcw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/iortcw/default.nix b/pkgs/games/iortcw/default.nix index 3aa459777ea..8af3dfe31f6 100644 --- a/pkgs/games/iortcw/default.nix +++ b/pkgs/games/iortcw/default.nix @@ -12,7 +12,7 @@ in buildEnv { pathsToLink = [ "/opt" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # so we can launch sp from mp game and vice versa postBuild = '' -- cgit 1.4.1 From dd9e24f0da6f06528f797fa28c0bb242889d32db Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:58:48 +0200 Subject: texlive: move makeWrapper to nativeBuildInputs --- pkgs/tools/typesetting/tex/texlive/combine.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index f553908d9cc..de9182c0b03 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -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; -- cgit 1.4.1 From 94ebbb266ca8fed0adb409504fd9449c397f0035 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 22:06:14 +0200 Subject: firefox: move makeWrapper to nativeBuildInputs --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2d2073b80b0..8868cbd003c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -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 -- cgit 1.4.1