diff options
Diffstat (limited to 'pkgs/development')
82 files changed, 128 insertions, 94 deletions
diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 2654cc467fe..3799f2c9212 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { rev = "15471e75f3d65b93150f414ebcaf59a03054b68d"; }; - buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool - jdk perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gmp which flex bison autoconf automake libtool jdk perl ]; preConfigure = '' cd aldor ; diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix index 4c84ef8c42b..10cf91579a4 100644 --- a/pkgs/development/compilers/chicken/4/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix @@ -18,7 +18,8 @@ in stdenv.mkDerivation ({ name = "chicken-${name}"; propagatedBuildInputs = buildInputs; - buildInputs = [ makeWrapper chicken ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ chicken ]; CSC_OPTIONS = lib.concatStringsSep " " cscOptions; diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 7102126206a..a6d19eaeb13 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -17,7 +17,8 @@ in stdenv.mkDerivation ({ name = "chicken-${name}"; propagatedBuildInputs = buildInputs; - buildInputs = [ makeWrapper chicken ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ chicken ]; CSC_OPTIONS = lib.concatStringsSep " " cscOptions; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index fc5f478177c..2c9999ccdb4 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { ./fuel-dir.patch ]; - buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with xorg; [ git rlwrap curl pkg-config perl libX11 pango cairo gtk2 gdk-pixbuf gtkglext mesa libXmu libXt libICE libSM openssl unzip ]; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index cd613c1b33b..2ddc5b3d3a8 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -12,7 +12,8 @@ in stdenv.mkDerivation { }; propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper unzip ] ; + buildInputs = [ unzip ] ; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index e063c4c0921..c5e767a46cd 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "ef093ae81424c4f3fe696eff9aefb5fb66899e11bb17ae0326adfb70d09c1c1f"; }; - buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper - readline ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gcc flex bison texinfo jdk erlang readline ]; patchPhase = '' # Fix calls to programs in /bin diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 8366fd77a47..b043187e6c1 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { TK_LIBRARY = "${tk-8_5}/lib/tk8.5"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir $out diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 7a6cdf4d705..41f4befe469 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -83,11 +83,9 @@ let result = stdenv.mkDerivation rec { sha256 = sha256.${stdenv.hostPlatform.system}; }; - nativeBuildInputs = [ file ] + nativeBuildInputs = [ file makeWrapper ] ++ lib.optional installjce unzip; - buildInputs = [ makeWrapper ]; - # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = 1; diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 770cc3415f2..ce4250f675e 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -83,8 +83,8 @@ rec { license = [ licenses.mit licenses.asl20 ]; }; - buildInputs = [ makeWrapper bash ] - ++ lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ] ++ lib.optional stdenv.isDarwin Security; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index f2835919631..aa55866def5 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec { # rls-rustc links to rustc_private crates CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ] + nativeBuildInputs = [ pkg-config cmake makeWrapper ]; + buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ] ++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index cb42235bc8e..8bdbbadc9d6 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index d3fa31ddd94..a91e0dbe1c7 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ jre ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index b173de58049..66a634914df 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ jre ncurses.dev ] ; - buildInputs = [ makeWrapper ] ; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index 113b22768d9..91eb9fc8417 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "12jn50h5jz0ac1vzld2mb94p1dyc8h0mk0hip2wj5xqk1dbzwxl4"; }; - buildInputs = [ cpio rsync makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cpio rsync ]; unpackPhase = '' ${xar}/bin/xar -xf $src diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 0aee1ca1f39..218b207f243 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -40,7 +40,8 @@ buildGoModule rec { ''; subPackages = [ "." ]; - buildInputs = [ llvm clang-unwrapped makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ llvm clang-unwrapped ]; propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ]; postInstall = '' diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index f7e338cf43f..8b74f46fd04 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { sha256 = "0nclr3d8ap0y5cg36i7g4ggdqci6m5q27y9f26b57km8p266kcpy"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # Any packages that depend on the compiler have a transitive # dependency on the Urn runtime support. propagatedBuildInputs = [ urn-rt ]; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 96c884ab602..92531eacd20 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0nd63i924ifh39cba1hd4sbi6vh1cb73v97nrn4bf8rrjh3k8pdi"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' make install PREFIX="$out" diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 57da5e862e9..baf83c64776 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = "installPhase"; diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index aaf368017ff..0e4beaa8508 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -20,7 +20,8 @@ in inherit src version; - buildInputs = [ erlang makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ erlang ]; LANG = "C.UTF-8"; LC_TYPE = "C.UTF-8"; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 0e3a0a46afd..114bc13f5d8 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr"; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index f792471c061..fb1fdd3c8e0 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -13,7 +13,7 @@ jruby = stdenv.mkDerivation rec { sha256 = "1dg0fz9b8m1k0sypvpxnf4xjqwc0pyy35xw4rsg4a7pha4jkprrj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -pv $out/docs diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 61cc8f9cd0f..38b599d339e 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "142285hd9mx0nx5zw0jvkpqkb4kbhgyyy52p5bj061ya8bg5jizy"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontUnpack = true; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 341797fa3f4..623eefec416 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { url = "https://www.software-lab.de/${pname}-${version}.tgz"; sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2"; }; - buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [openssl] ++ optional stdenv.is64bit jdk; patchPhase = '' sed -i "s/which java/command -v java/g" mkAsm diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 19e6c93378f..863df66899b 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256="0px6x5ivcdbbp2pz5n1r1cwg1syadklhjw8piqhl63n91i4r7iyb"; }; - buildInputs = [ bison flex makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bison flex ]; propagatedBuildInputs = [ llvm gmp mpfr readline ]; NIX_LDFLAGS = "-lLLVMJIT"; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 5eccebf0245..42e82cd3a51 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto="; }; - buildInputs = [ rakudo makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ rakudo ]; installPhase = '' mkdir -p "$out" diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index cd2b74db052..8b49a743b4a 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6"; }; - buildInputs = [ makeWrapper jdk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk ]; dontUnpack = true; diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix index 34c3d26c55e..4ae17723275 100644 --- a/pkgs/development/libraries/hunspell/wrapper.nix +++ b/pkgs/development/libraries/hunspell/wrapper.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { name = (appendToName "with-dicts" hunspell).name; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath} ''; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index ddf95ead249..5519a1fb766 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; outputs = [ "out" "bin" ]; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 5e02a9fd522..43f63d91a61 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake libtool glib readline makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ autoconf automake libtool glib readline ]; preConfigure = '' substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" diff --git a/pkgs/development/libraries/nuspell/wrapper.nix b/pkgs/development/libraries/nuspell/wrapper.nix index 4386542ff20..ab09931579c 100644 --- a/pkgs/development/libraries/nuspell/wrapper.nix +++ b/pkgs/development/libraries/nuspell/wrapper.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { name = (appendToName "with-dicts" nuspell).name; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${searchPath} ''; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index b649b1d9c11..e5657bcb3c3 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh"; }; - buildInputs = [ ant jdk python makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jdk python ]; buildPhase = "ant dist"; diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 5602f598e9d..1aa81132c26 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; - buildInputs = [ makeWrapper which xdg-utils ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which xdg-utils ]; unpackPhase = '' mkdir -p phony-home $out/share/applications diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index f471dc977b3..601cac372c8 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 0742247893c..52257bfd461 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index 965a385ac56..78044752b54 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index b4842da12dd..cf869b6e5ef 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -29,9 +29,8 @@ stdenv.mkDerivation rec { sha256 = "0xda4fj8p5102lh9xmrn5mv3s0ps6yykqj3mpjf72gf4zd6fzcn7"; }) ]; - buildInputs = [ which makeWrapper ocaml findlib - lwt_react pgocaml camlzip ocaml_sqlite3 - ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which ocaml findlib lwt_react pgocaml camlzip ocaml_sqlite3 ]; propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet ocaml_pcre tyxml xml-light diff --git a/pkgs/development/perl-modules/ham/default.nix b/pkgs/development/perl-modules/ham/default.nix index 4f6dc5d9ddb..8b19c9404fe 100644 --- a/pkgs/development/perl-modules/ham/default.nix +++ b/pkgs/development/perl-modules/ham/default.nix @@ -13,7 +13,7 @@ buildPerlPackage { outputs = [ "out" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ openssh GitRepository URI XMLMini ]; preConfigure = '' diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 6b27e8e5d42..30a7e5174a6 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -9,7 +9,7 @@ let withPlugins = plugins: buildPythonPackage { name = "${package.name}-with-plugins"; phases = [ "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; installPhase = '' diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 184a215c407..98878c90640 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd"; }; - buildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] ++ lib.optionals isPy27 [ singledispatch futures ]; diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index a528de8e0ca..49796054b56 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildPhase = "${python.interpreter} ./setup.py build"; installPhase = '' ${python.interpreter} ./setup.py install --prefix="$out" || exit 1 diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 35c75d67da5..30df5daed6f 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1kvc7fkp45w48f0bxwbxvxkicnjrrydki0hllg294n1wrp80zzyk"; }; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; preBuild = '' patchShebangs bin/ diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 91f3f24d6f1..f7f933392ab 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -12,8 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; propagatedBuildInputs = with qt5; [ qt5.qtbase qtdeclarative diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 182b8633aa0..93644caa5a4 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "ant"; inherit version; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index d88068c1c3e..d2ef8361ec0 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "ant"; inherit version; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 4658703f8b1..3a1866e0b39 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1i9qlj3vy4j1yyf22nwisd0pg88n9qzp9ymfhwqabadka7br3b96"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; inherit jdk; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index d314064904d..4735a7559cf 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -33,7 +33,8 @@ rec { echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies ''; - buildInputs = [ unzip java makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip java ]; meta = { description = "Enterprise-grade build system"; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 488697033d9..51b97b242d5 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ jdk ]; # the jar is not in share/java, because it's a standalone jar and should diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index d22f4bc487f..093a825723c 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; sourceRoot = "."; installPhase = '' diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index efc6523cd98..cb977191eaf 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontBuild = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index ae10c402945..0fb3ae81030 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; sha256 = "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out PREFIX=$out make install diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index eacd35ed760..92249282267 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Zwh8baMD8jt+yfsK0jpsTEU32rT+IAQGwavVT3rpRsU="; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; unpackPhase = '' tar xfz ${src} diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index c42197e13cf..8fb7677f584 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -49,7 +49,8 @@ in sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k"; }; - buildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; unpackCmd = "unzip $curSrc"; diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 4d572e070e7..c20d7a2e49a 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp"; }; - buildInputs = [ python makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python ]; installPhase = '' mkdir -p $out/bin $out/share/ diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 97d1c753682..e14cfe87404 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ripayv1vf4f4ylxr7h9kad2xhy3y98ca8s4p38z7dn8l47zg0qw"; }; - buildInputs = [ makeWrapper jre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index 233b3933876..15a3a683403 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; - buildInputs = [ env makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ env ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index da387105cef..186608cde3f 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1"; }; - buildInputs = [ makeWrapper perl openssh rsync ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl openssh rsync ]; doCheck = true; diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 0f7edeea812..62aa0ab5dec 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./backslashes-quotes.diff ]; - buildInputs = [ tk makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ tk ]; installPhase = '' mkdir -p $out/bin $out/share/${name} diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index d62166ca2b4..5797fcc4109 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm644 $src $out/share/java/${pname}.jar diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 285805ccb02..61251434578 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd"; }; - buildInputs = [ expect makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ expect ]; doCheck = true; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 6f9f5e113c0..47716b5ea9e 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk"; }; - nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - buildInputs = [ gettext libtool makeWrapper texinfo ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [ gettext libtool texinfo ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 13437b71953..f5298d685eb 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ globalplatform pcsclite makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ globalplatform pcsclite ]; postFixup = '' wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 3fa2d219fe3..9ba19c836b5 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ./disable-nodejs-version-check.patch ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/libexec/kibana $out/bin diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 7f46d6f6512..754559969d5 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ./disable-nodejs-version-check-7.patch ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/libexec/kibana $out/bin diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index c92d7b07798..f37815081ee 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index d86277993ca..b26fbf75031 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { inherit name; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # The default build phase (`make`) runs the test code. It's difficult to do # the test in the build environment because it depends on the system package diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index fb85aa80dc3..63452728b91 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation { { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh"; sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } ); - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "installPhase" ]; # TODO: load generator / monitoring agent only builds diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 31358129821..475c08eb169 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { ln -s $out/share/nwjs/nwjc $out/bin ''; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; meta = with lib; { description = "An app runtime based on Chromium and node.js"; diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index 72177582919..67a86ca8dec 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1cly9lhrawnc42r31b7r0p0i6hcx8r00aa17gv7w9pcpj8ngb4v2"; }; - buildInputs = [ makeWrapper nim pcre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ nim pcre ]; patches = [ (fetchpatch { diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index d3490b2b9c9..1356bc46ced 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { ln -s $out/share/nwjs/nw $out/bin ''; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; meta = with lib; { description = "An app runtime based on Chromium and node.js"; diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 047246cd0a0..5a4b55cc7fe 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { patchFlags = [ "-p0" ]; patches = [ ./warn.patch ]; - buildInputs = [ ocaml makeWrapper ncurses ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ocaml ncurses ]; phases = "unpackPhase patchPhase buildPhase"; buildPhase = '' diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index a128f2144e9..610093af19f 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -47,7 +47,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip curl ncurses ocaml ]; src = srcs.opam; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b99880fe7f3..30bc089ee0f 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -63,7 +63,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "2.0.8"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; src = srcs.opam; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 2cc46d018ec..0df9b0e15d1 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -17,7 +17,8 @@ buildGoModule rec { subPackages = [ "cmd/operator-sdk" ]; - buildInputs = [ go makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ go ]; # operator-sdk uses the go compiler at runtime allowGoReference = true; diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 4547012e2f3..597d680cc2b 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "out-of-tree"; version = "1.4.0"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; src = fetchgit { rev = "refs/tags/v${version}"; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index c5d65a8239e..641c1581b05 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -37,7 +37,7 @@ let in runCommand "systemtap-${kernel.version}-${version}" { inherit stapBuild kernelBuildDir; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; meta = { homepage = "https://sourceware.org/systemtap/"; repositories.git = url; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 71cf10e63b9..94b5e5a6dcc 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri"; }; - buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl bash diffutils patch findutils diffstat ]; postInstall = '' wrapProgram $out/bin/quilt --prefix PATH : \ diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 9e4ac0b58eb..8b516627220 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = ["installPhase"]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index 00fda8bfc36..c27d6e8a65f 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -19,7 +19,8 @@ in stdenv.mkDerivation { name = "${baseName}-${version}"; - buildInputs = [ jdk makeWrapper deps ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk deps ]; doCheck = true; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index c25190cab74..b029e7711a3 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { dontUnpack = true; - buildInputs = [ jdk makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk ]; installPhase = '' mkdir -p $out/share/lib/selendroid diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 10893a9d170..c4f8653794f 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -18,7 +18,8 @@ in stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; installPhase = '' mkdir -p $out/share/lib/${pname}-${version} diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index cdf2242bdba..ef04725e562 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = [ perlPackages.perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; postInstall = '' wrapProgram $out/bin/sslmate --prefix PERL5LIB : \ diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index 44dfa1a4ba1..02183282ce1 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -22,7 +22,8 @@ in stdenv.mkDerivation rec { sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc"; }; - buildInputs = [ thrustEnv makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ thrustEnv unzip ]; phases = [ "installPhase" "fixupPhase" ]; |