buildNativeInputs -> nativeBuildInputs

wip/yesman
Mathijs Kwik 12 years ago
parent eebc0c6965
commit 755dac3c6d
  1. 2
      pkgs/applications/editors/zile/default.nix
  2. 8
      pkgs/development/libraries/eigen/2.0.nix
  3. 2
      pkgs/development/tools/phantomjs/default.nix
  4. 2
      pkgs/tools/graphics/argyllcms/default.nix
  5. 2
      pkgs/tools/misc/youtube-dl/default.nix

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ help2man perl ];
# `help2man' wants to run Zile, which fails when cross-compiling.
crossAttrs.buildNativeInputs = [];
crossAttrs.nativeBuildInputs = [];
# Tests can't be run because most of them rely on the ability to
# fiddle with the terminal.

@ -5,15 +5,15 @@ let
in
stdenv.mkDerivation {
name = "eigen-${v}";
src = fetchurl {
url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
name = "eigen-${v}.tar.bz2";
sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0";
};
buildNativeInputs = [ cmake ];
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
sha256 = "1m14czhi3b388didn0a881glsx8bnsg9gnxgj5lghr4l5mgqyrd7";
};
buildNativeInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx;
nativeBuildInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx;
buildPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
upx -d bin/phantomjs

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
-ljpeg -ltiff ;
'';
buildNativeInputs = [ jam unzip ];
nativeBuildInputs = [ jam unzip ];
preConfigure = ''
cp ${jamTop} Jamtop

@ -12,7 +12,7 @@ stdenv.mkDerivation {
};
buildInputs = [ python ];
buildNativeInputs = [ pandoc zip ];
nativeBuildInputs = [ pandoc zip ];
patchPhase = ''
rm youtube-dl

Loading…
Cancel
Save