diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/freeplane/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/misc/variety/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 3 | ||||
-rw-r--r-- | pkgs/games/0ad/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/games/flare/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/iortcw/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/uchess/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/cd-dvd/brasero/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/gawk/gawk-with-extensions.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/combine.nix | 3 |
11 files changed, 15 insertions, 13 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} 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; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 6942365d63d..c7632ad338d 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 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 ]; 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" 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 = '' 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 ''; 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 \ 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 \ 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 diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 17e46d3f93f..2e9ccc70ff2 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; |