alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: makeWrapper buildInputs to nativeBuildInputs

Browse source
This commit is contained in:
Ben Siraphob 2021-02-07 16:17:39 +07:00
parent 06c2bba257
commit e03c068af5
332 changed files with 532 additions and 391 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
maintainers/scripts/nixpkgs-lint.nix
View file

@ -3,7 +3,8 @@
stdenv.mkDerivation {
name = "nixpkgs-lint-1";
buildInputs = [ makeWrapper perl perlPackages.XMLSimple ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl perlPackages.XMLSimple ];
dontUnpack = true;
buildPhase = "true";

3
pkgs/applications/audio/MMA/default.nix
View file

@ -9,7 +9,8 @@
sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732";
};
buildInputs = [ makeWrapper python3 alsaUtils timidity ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 alsaUtils timidity ];
patchPhase = ''
sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec

2
pkgs/applications/audio/baudline/default.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
else
throw "baudline isn't supported (yet?) on ${stdenv.hostPlatform.system}";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
# Prebuilt binary distribution.
# "patchelf --set-rpath" seems to break the application (cannot start), using

2
pkgs/applications/audio/caudec/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation {
patchShebangs ./install.sh
'';
buildInputs = [ bash makeWrapper ];
nativeBuildInputs = [ bash makeWrapper ];
installPhase = ''
./install.sh --prefix=$out/bin

6
pkgs/applications/audio/clementine/default.nix
View file

@ -24,7 +24,7 @@ let
./clementine-spotify-blob.patch
];
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
boost
@ -68,7 +68,7 @@ let
inherit src patches nativeBuildInputs postPatch;
# gst_plugins needed for setup-hooks
buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins;
buildInputs = buildInputs ++ gst_plugins;
preConfigure = ''
rm -rf ext/{,lib}clementine-spotifyblob
@ -102,7 +102,7 @@ let
# Use the same patches and sources as Clementine
inherit src nativeBuildInputs patches postPatch;
buildInputs = buildInputs ++ [ libspotify makeWrapper ];
buildInputs = buildInputs ++ [ libspotify ];
# Only build and install the Spotify blob
preBuild = ''
cd ext/clementine-spotifyblob

3
pkgs/applications/audio/clerk/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "0y045my65hr3hjyx13jrnyg6g3wb41phqb1m7azc4l6vx6r4124b";
};
buildInputs = [ makeWrapper pythonPackages.mpd2 ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pythonPackages.mpd2 ];
dontBuild = true;

2
pkgs/applications/audio/deadbeef/wrapper.nix
View file

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

7
pkgs/applications/audio/faust/faust1.nix
View file

@ -30,7 +30,7 @@ let
inherit src;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit wrap wrapWithBuildEnv;
@ -159,8 +159,7 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
@ -195,7 +194,7 @@ let
in stdenv.mkDerivation ((faust2ApplBase args) // {
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
for script in "$out"/bin/*; do

5
pkgs/applications/audio/faust/faust2.nix
View file

@ -168,8 +168,7 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
@ -209,7 +208,7 @@ let
in stdenv.mkDerivation ((faust2ApplBase args) // {
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
for script in "$out"/bin/*; do

2
pkgs/applications/audio/google-play-music-desktop-player/default.nix
View file

@ -53,7 +53,7 @@ stdenv.mkDerivation {
};
dontBuild = true;
buildInputs = [ dpkg makeWrapper ];
nativeBuildInputs = [ dpkg makeWrapper ];
unpackPhase = ''
dpkg -x $src .

4
pkgs/applications/audio/jamin/default.nix
View file

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 ]
++ (with perlPackages; [ perl XMLParser ]);
NIX_LDFLAGS = "-ldl";

4
pkgs/applications/audio/lash/default.nix
View file

@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [ ./socket.patch ./gcc-47.patch ];
buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper
pkg-config readline ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ];
propagatedBuildInputs = [ libuuid ];
NIX_LDFLAGS = "-lm -lpthread -luuid";

4
pkgs/applications/audio/linuxband/default.nix
View file

@ -11,8 +11,8 @@ in stdenv.mkDerivation rec {
sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
patchPhase = ''
sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in

2
pkgs/applications/audio/puredata/wrapper.nix
View file

@ -7,7 +7,7 @@ in symlinkJoin {
paths = [ puredata ] ++ plugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/pd \

3
pkgs/applications/audio/real_time_config_quick_scan/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "16kanzp5i353x972zjkwgi3m8z90wc58613mlfzb0n01djdnm6k5";
};
buildInputs = [ perlPackages.perl makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perlPackages.perl ];
dontBuild = true;

3
pkgs/applications/audio/rubyripper/default.nix
View file

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
preConfigure = "patchShebangs .";
configureFlags = [ "--enable-cli" ];
buildInputs = [ ruby cdparanoia makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ruby cdparanoia ];
postInstall = ''
wrapProgram "$out/bin/rrip_cli" \
--prefix PATH : "${ruby}/bin" \

3
pkgs/applications/audio/spotify/default.nix
View file

@ -81,7 +81,8 @@ stdenv.mkDerivation {
sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";
};
buildInputs = [ squashfsTools makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ squashfsTools ];
dontStrip = true;
dontPatchELF = true;

3
pkgs/applications/audio/vkeybd/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a";
};
buildInputs = [ alsaLib libX11 makeWrapper tcl tk ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ alsaLib libX11 tcl tk ];
configurePhase = ''
mkdir -p $out/bin

2
pkgs/applications/editors/eclipse/default.nix
View file

@ -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.

2
pkgs/applications/editors/kakoune/wrapper.nix
View file

@ -9,7 +9,7 @@ in
symlinkJoin {
name = "kakoune-${kakoune.version}";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
paths = [ kakoune ] ++ requestedPlugins;

3
pkgs/applications/editors/kodestudio/default.nix
View file

@ -29,7 +29,8 @@ in
inherit sha256;
};
buildInputs = [ makeWrapper libXScrnSaver ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libXScrnSaver ];
desktopItem = makeDesktopItem {
name = "kodestudio";

2
pkgs/applications/editors/music/tuxguitar/default.nix
View file

@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = metadata.sha256;
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin

2
pkgs/applications/editors/neovim/wrapper.nix
View file

@ -106,7 +106,7 @@ let
preferLocalBuild = true;
buildInputs = [makeWrapper];
nativeBuildInputs = [ makeWrapper ];
passthru = { unwrapped = neovim; };
meta = neovim.meta // {

3
pkgs/applications/editors/netbeans/default.nix
View file

@ -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";

4
pkgs/applications/editors/supertux-editor/default.nix
View file

@ -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

2
pkgs/applications/editors/vim/macvim-configurable.nix
View file

@ -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.

3
pkgs/applications/editors/vscode/with-extensions.nix
View file

@ -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;

2
pkgs/applications/graphics/gimp/wrapper.nix
View file

@ -11,7 +11,7 @@ in symlinkJoin {
paths = [ gimp ] ++ selectedPlugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
for each in gimp-${versionBranch} gimp-console-${versionBranch}; do

2
pkgs/applications/graphics/glimpse/wrapper.nix
View file

@ -12,7 +12,7 @@ symlinkJoin {
paths = [ glimpse ] ++ selectedPlugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do

3
pkgs/applications/graphics/imagej/default.nix
View file

@ -15,7 +15,8 @@ let
url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";
sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
};
buildInputs = [ unzip makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip ];
inherit jre;
# JAR files that are intended to be used by other packages

2
pkgs/applications/graphics/inkscape/with-extensions.nix
View file

@ -10,7 +10,7 @@ symlinkJoin {
paths = [ inkscape ] ++ inkscapeExtensions;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
rm -f $out/bin/inkscape

2
pkgs/applications/graphics/tesseract/wrapper.nix
View file

@ -17,7 +17,7 @@ let
tesseractWithData = tesseractBase.overrideAttrs (_: {
inherit tesseractBase tessdata;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata

2
pkgs/applications/graphics/unigine-valley/default.nix
View file

@ -38,7 +38,7 @@ in
sourceRoot = "Unigine_Valley-${version}";
instPath = "lib/unigine/valley";
buildInputs = [file makeWrapper];
nativeBuildInputs = [file makeWrapper];
libPath = lib.makeLibraryPath [
stdenv.cc.cc # libstdc++.so.6

3
pkgs/applications/misc/ape/default.nix
View file

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
inherit pname;
version = "2019-08-10";
buildInputs = [ swiProlog makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ swiProlog ];
src = fetchFromGitHub {
owner = "Attempto";

3
pkgs/applications/misc/audio/wavesurfer/default.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
};
buildInputs = [ snack tcl tk makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ snack tcl tk ];
installPhase = ''
mkdir -p $out/{bin,nix-support,share/wavesurfer/}

2
pkgs/applications/misc/bashSnippets/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation {
sha256 = "044nxgd3ic2qr6hgq5nymn3dyf5i4s8mv5z4az6jvwlrjnvbg8cp";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
patchShebangs install.sh

4
pkgs/applications/misc/cli-visualizer/default.nix
View file

@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
sed '1i#include <cmath>' -i src/Transformer/SpectrumCircleTransformer.cpp
'';
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ];
buildInputs = [ fftw ncurses5 libpulseaudio ];
buildFlags = [ "ENABLE_PULSE=1" ];

3
pkgs/applications/misc/clipmenu/default.nix
View file

@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
'';
makeFlags = [ "PREFIX=$(out)" ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ xsel clipnotify ];
nativeBuildInputs = [ makeWrapper xsel clipnotify ];
postFixup = ''
sed -i "$out/bin/clipctl" -e 's,clipmenud\$,\.clipmenud-wrapped\$,'

3
pkgs/applications/misc/ding/default.nix
View file

@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU=";
};
buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ aspellEnv fortune gnugrep tk tre ];
patches = [ ./dict.patch ];

2
pkgs/applications/misc/gremlin-console/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/opt

2
pkgs/applications/misc/icesl/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr";
} else throw "Unsupported architecture";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
cp -r ./ $out
mkdir $out/oldbin

3
pkgs/applications/misc/josm/default.nix
View file

@ -23,7 +23,8 @@ stdenv.mkDerivation {
dontUnpack = true;
buildInputs = lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ jre ];
installPhase =
if stdenv.isDarwin then ''

3
pkgs/applications/misc/keepass/default.nix
View file

@ -12,7 +12,8 @@ with builtins; buildDotnetPackage rec {
sourceRoot = ".";
buildInputs = [ unzip makeWrapper icoutils ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip icoutils ];
patches = [
(substituteAll {

3
pkgs/applications/misc/mpvc/default.nix
View file

@ -17,7 +17,8 @@ stdenv.mkDerivation {
wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/"
'';
buildInputs = [ socat makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ socat ];
meta = with lib; {
description = "A mpc-like control interface for mpv";

3
pkgs/applications/misc/omegat.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation {
sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs";
};
buildInputs = [ unzip makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip ];
unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o

3
pkgs/applications/misc/openjump/default.nix
View file

@ -18,7 +18,8 @@ stdenv.mkDerivation {
cd $out; unzip $src
'';
buildInputs = [unzip makeWrapper];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip ];
installPhase = ''
dir=$(echo $out/OpenJUMP-*)

3
pkgs/applications/misc/projectlibre/default.nix
View file

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq";
};
buildInputs = [ ant jdk makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ant jdk ];
buildPhase = ''
export ANT_OPTS=-Dbuild.sysclasspath=ignore
${ant}/bin/ant -f openproj_build/build.xml

2
pkgs/applications/misc/sidequest/default.nix
View file

@ -19,7 +19,7 @@
sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p "$out/lib/SideQuest" "$out/bin"

3
pkgs/applications/misc/sweethome3d/default.nix
View file

@ -34,7 +34,8 @@ let
patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so
'';
buildInputs = [ ant jdk makeWrapper p7zip gtk3 gsettings-desktop-schemas ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas ];
buildPhase = ''
ant furniture textures help

3
pkgs/applications/misc/sweethome3d/editors.nix
View file

@ -23,7 +23,8 @@ let
categories = "Graphics;2DGraphics;3DGraphics;";
};
buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ant jre jdk gtk3 gsettings-desktop-schemas ];
patchPhase = ''
sed -i -e 's,../SweetHome3D,${application.src},g' build.xml

2
pkgs/applications/misc/tabula/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''

2
pkgs/applications/misc/translate-shell/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installFlags = [ "PREFIX=$(out)" ];

4
pkgs/applications/misc/viking/default.nix
View file

@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2
] ++ lib.optional withMapnik mapnik
++ lib.optional withGeoClue geoclue2

3
pkgs/applications/misc/wordnet/default.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
};
buildInputs = [ tcl tk xlibsWrapper makeWrapper ]
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ tcl tk xlibsWrapper ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
hardeningDisable = [ "format" ];

4
pkgs/applications/misc/xfontsel/default.nix
View file

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [libX11 makeWrapper libXaw];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [libX11 libXaw];
# Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu";

3
pkgs/applications/misc/zathura/wrapper.nix
View file

@ -4,8 +4,7 @@ symlinkJoin {
paths = with zathura_core; [ man dev out ] ++ plugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = let
fishCompletion = "share/fish/vendor_completions.d/zathura.fish";

2
pkgs/applications/networking/charles/default.nix
View file

@ -28,7 +28,7 @@ let
url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
inherit sha256;
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \

3
pkgs/applications/networking/cluster/spark/default.nix
View file

@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";
};
buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre pythonPackages.python pythonPackages.numpy ]
++ optional RSupport R;
untarDir = "${pname}-${version}-bin-without-hadoop";

2
pkgs/applications/networking/cluster/ssm-agent/default.nix
View file

@ -14,7 +14,7 @@ buildGoPackage rec {
"agent/cli-main"
];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub {
rev = version;

2
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -117,7 +117,7 @@ let
else
lib.appendToName "with-plugins" (stdenv.mkDerivation {
inherit (terraform) name meta;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = pluginDir + ''
mkdir -p $out/bin/

3
pkgs/applications/networking/ids/snort/default.nix
View file

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73";
};
buildInputs = [ makeWrapper pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];

3
pkgs/applications/networking/instant-messengers/gomuks/default.nix
View file

@ -26,7 +26,8 @@ buildGoModule rec {
doCheck = false;
buildInputs = [ makeWrapper olm ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ olm ];
# Upstream issue: https://github.com/tulir/gomuks/issues/260
patches = lib.optional stdenv.isLinux (substituteAll {

2
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View file

@ -47,7 +47,7 @@ in stdenv.mkDerivation {
sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
ar x $src

4
pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
View file

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ];
preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \

3
pkgs/applications/networking/instant-messengers/viber/default.nix
View file

@ -13,7 +13,8 @@ stdenv.mkDerivation {
sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh";
};
buildInputs = [ dpkg makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ dpkg ];
dontUnpack = true;

4
pkgs/applications/networking/insync/default.nix
View file

@ -12,9 +12,7 @@ stdenv.mkDerivation rec {
else
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ autoPatchelfHook ];
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
postPatch = ''
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable

3
pkgs/applications/networking/jnetmap/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl";
};
buildInputs = [ jre makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
dontUnpack = true;

2
pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
View file

@ -4,7 +4,7 @@ symlinkJoin {
name = "evolution-with-plugins";
paths = [ gnome3.evolution-data-server ] ++ plugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
for i in $out/bin/* $out/libexec/**; do

3
pkgs/applications/networking/p2p/vuze/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "07w6ipyiy8hi88d6yxbbf3vkv26mj7dcz9yr8141hb2ig03v0h0p";
};
buildInputs = [ makeWrapper jdk ant ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk ant ];
buildPhase = "ant";

2
pkgs/applications/networking/remote/vmware-horizon-client/default.nix
View file

@ -52,7 +52,7 @@ let
url = "https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-Linux-2012-8.1.0-17349998.tar.gz";
sha256 = "0afda1f3116e75a4e7f89990d8ee60ccea5f3bb8a2360652162fa11c795724ce";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir ext $out
find ${sysArch} -type f -print0 | xargs -0n1 tar -Cext --strip-components=1 -xf

3
pkgs/applications/networking/sync/unison/default.nix
View file

@ -14,7 +14,8 @@ stdenv.mkDerivation (rec {
sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
};
buildInputs = [ ocaml makeWrapper ncurses ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml ncurses ];
preBuild = (if enableX11 then ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml

2
pkgs/applications/networking/tsung/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [
erlang
gnuplot

2
pkgs/applications/networking/wg-bond/default.nix
View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1v2az0v6l8mqryvq3898hm7bpvqdd2c4kpv6ck7932jfjyna512k";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/wg-bond --set PATH ${
lib.makeBinPath [ wireguard-tools ]

3
pkgs/applications/office/docear/default.nix
View file

@ -12,7 +12,8 @@ stdenv.mkDerivation {
sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4";
};
buildInputs = [ oraclejre makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ oraclejre ];
buildPhase = "";
installPhase = ''

3
pkgs/applications/office/impressive/default.nix
View file

@ -16,7 +16,8 @@ in stdenv.mkDerivation {
sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl";
};
buildInputs = [ makeWrapper pythonEnv ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pythonEnv ];
configurePhase = ''
# Let's fail at build time if the library we're substituting in doesn't

3
pkgs/applications/office/treesheets/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4";
};
buildInputs = [ wxGTK makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ wxGTK ];
preConfigure = "cd src";

2
pkgs/applications/science/biology/eggnog-mapper/default.nix
View file

@ -16,7 +16,7 @@ python27Packages.buildPythonApplication rec {
sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf";
});
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ];
# make emapper find diamond & hmmer

3
pkgs/applications/science/biology/platypus/default.nix
View file

@ -13,7 +13,8 @@ in stdenv.mkDerivation {
sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw";
};
buildInputs = [ htslib python zlib makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ htslib python zlib ];
buildPhase = ''
patchShebangs .

3
pkgs/applications/science/biology/snpeff/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";
};
buildInputs = [ unzip jre makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip jre ];
sourceRoot = "snpEff";

3
pkgs/applications/science/biology/varscan/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0=";
};
buildInputs = [ jre makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
phases = [ "installPhase" ];

3
pkgs/applications/science/logic/isabelle/default.nix
View file

@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3";
};
buildInputs = [ perl polyml z3 makeWrapper ]
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl polyml z3 ]
++ lib.optionals (!stdenv.isDarwin) [ nettools java ];
sourceRoot = dirname;

3
pkgs/applications/science/logic/leo2/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv";
};
buildInputs = [ makeWrapper eprover ocaml perl zlib ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ eprover ocaml perl zlib ];
sourceRoot = "leo2/src";

3
pkgs/applications/science/logic/satallax/default.nix
View file

@ -3,7 +3,8 @@ stdenv.mkDerivation rec {
pname = "satallax";
version = "2.7";
buildInputs = [ocaml zlib which eprover makeWrapper coq];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ocaml zlib which eprover coq];
src = fetchurl {
url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";
sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";

3
pkgs/applications/science/logic/tlaplus/default.nix
View file

@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891";
};
buildInputs = [ makeWrapper adoptopenjdk-bin ant ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ adoptopenjdk-bin ant ];
buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist";
installPhase = ''

2
pkgs/applications/science/logic/tlaplus/toolbox.nix
View file

@ -28,7 +28,7 @@ in stdenv.mkDerivation {
sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
phases = [ "installPhase" ];

3
pkgs/applications/science/logic/why3/with-provers.nix
View file

@ -15,7 +15,8 @@ in stdenv.mkDerivation {
phases = [ "buildPhase" "installPhase" ];
buildInputs = [ why3 makeWrapper ] ++ provers;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ why3 ] ++ provers;
buildPhase = ''
mkdir -p $out/share/why3/

2
pkgs/applications/science/logic/workcraft/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0v71x3fph2j3xrnysvkm7zsgnbxisfbdfgxzvzxxfdg59a6l3xid";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];

3
pkgs/applications/science/math/calc/default.nix
View file

@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
--replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}'
'';
buildInputs = [ util-linux makeWrapper ]
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ util-linux ]
++ lib.optionals enableReadline [ readline ncurses ];
makeFlags = [

3
pkgs/applications/science/math/weka/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
};
buildInputs = [ unzip makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip ];
# The -Xmx1000M comes suggested from their download page:
# http://www.cs.waikato.ac.nz/ml/weka/downloading.html

3
pkgs/applications/science/medicine/aliza/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation {
name = "aliza.rpm";
};
buildInputs = [ rpmextract makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ rpmextract ];
unpackCmd = "rpmextract $curSrc";

3
pkgs/applications/science/misc/cytoscape/default.nix
View file

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
})
];
buildInputs = [jre makeWrapper];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
installPhase = ''
mkdir -pv $out/{share,bin}

3
pkgs/applications/science/programming/plm/default.nix
View file

@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}.jar";
};
buildInputs = [ makeWrapper jre gcc valgrind ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre gcc valgrind ];
phases = [ "installPhase" ];

2
pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
View file

@ -40,7 +40,7 @@ let
paths = [ rxvt-unicode-unwrapped ] ++ plugins ++ extraDeps;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/urxvt \

3
pkgs/applications/terminal-emulators/terminus/default.nix
View file

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb";
sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb";
};
buildInputs = [ dpkg makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ dpkg ];
unpackPhase = ''
mkdir pkg
dpkg-deb -x $src pkg

2
pkgs/applications/version-management/cvs2svn/default.nix
View file

@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec {
sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
checkInputs = [ subversion git breezy ];

3
pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
View file

@ -15,7 +15,8 @@ in
sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz";
};
buildInputs = [ jre makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
phases = "installPhase";

3
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287";
};
buildInputs = [mercurial.python mercurial makeWrapper];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [mercurial.python mercurial];
installPhase = ''
binPath=$out/bin

4
pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
View file

@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602";
};
nativeBuildInputs = [ libxslt ];
nativeBuildInputs = [ libxslt makeWrapper ];
buildInputs = [ openssl makeWrapper ];
buildInputs = [ openssl ];
patchPhase = ''
substituteInPlace commands.cpp \

2
pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
installFlags = [ "prefix=$(out)" ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
# perl provides shasum
postInstall = ''

2
pkgs/applications/version-management/git-and-tools/git-open/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildPhase = null;

Some files were not shown because too many files have changed in this diff Show more