diff options
Diffstat (limited to 'pkgs/applications/editors')
9 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index cff482e887d..2c067250309 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -162,7 +162,7 @@ in rec { # Eclipse. name = (lib.meta.appendToName "with-plugins" eclipse).name; in - runCommand name { buildInputs = [ makeWrapper ]; } '' + runCommand name { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin $out/etc # Prepare an eclipse.ini with the plugin directory. diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix index 7ac56d9cb1e..451507885ce 100644 --- a/pkgs/applications/editors/kakoune/wrapper.nix +++ b/pkgs/applications/editors/kakoune/wrapper.nix @@ -9,7 +9,7 @@ in symlinkJoin { name = "kakoune-${kakoune.version}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; paths = [ kakoune ] ++ requestedPlugins; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index e0704cdbc85..aa7b7b19448 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -29,7 +29,8 @@ in inherit sha256; }; - buildInputs = [ makeWrapper libXScrnSaver ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libXScrnSaver ]; desktopItem = makeDesktopItem { name = "kodestudio"; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 63be87ee86c..90879b352e1 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = metadata.sha256; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 5c6c6c1a8d5..41ff62a619f 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -106,7 +106,7 @@ let preferLocalBuild = true; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; passthru = { unwrapped = neovim; }; meta = neovim.meta // { diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 9206b296b9a..f968b85c6ff 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -56,7 +56,8 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - buildInputs = [ makeWrapper perl python unzip libicns imagemagick ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl python unzip libicns imagemagick ]; meta = { description = "An integrated development environment for Java, C, C++ and PHP"; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index e474ff5f19b..6e3580a563c 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 6ea6b6c6094..7ed3dee9b6b 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -29,7 +29,7 @@ let "/Applications/MacVim.app/Contents/MacOS" "/Applications/MacVim.app/Contents/bin" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # We need to do surgery on the resulting app. We can't just make a wrapper for vim because this # is a GUI app. We need to copy the actual GUI executable image as AppKit uses the loaded image's # path to locate the bundle. We can use symlinks for other executables and resources though. diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index c30b52782ef..d2c91f155d5 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -57,7 +57,8 @@ in # When no extensions are requested, we simply redirect to the original # non-wrapped vscode executable. runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { - buildInputs = [ vscode makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ vscode ]; dontPatchELF = true; dontStrip = true; meta = vscode.meta; |