diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-01-13 11:33:45 +0100 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-01-13 11:33:45 +0100 |
| commit | 0890c454986993a262a31aa2779e9269b7d58952 (patch) | |
| tree | 7a0cf6694fb0ad785bbc198b231d90b73bb51077 | |
| parent | 418f6a536f077c7c72d51092efd544e99123c313 (diff) | |
| download | nixpkgs-0890c454986993a262a31aa2779e9269b7d58952.tar nixpkgs-0890c454986993a262a31aa2779e9269b7d58952.tar.gz nixpkgs-0890c454986993a262a31aa2779e9269b7d58952.tar.bz2 nixpkgs-0890c454986993a262a31aa2779e9269b7d58952.tar.lz nixpkgs-0890c454986993a262a31aa2779e9269b7d58952.tar.xz nixpkgs-0890c454986993a262a31aa2779e9269b7d58952.tar.zst nixpkgs-0890c454986993a262a31aa2779e9269b7d58952.zip | |
buildNativeInputs -> nativeBuildInputs
| -rw-r--r-- | pkgs/applications/editors/zile/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/eigen/2.0.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/phantomjs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/argyllcms/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index ea2000b57db..5929f4c76c8 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/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. diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 6884aca16fc..9cf0a3c350c 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -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; diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 33b99e12de5..5d9433cc5ca 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -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 diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 08cd012e079..934a27ef25b 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { -ljpeg -ltiff ; ''; - buildNativeInputs = [ jam unzip ]; + nativeBuildInputs = [ jam unzip ]; preConfigure = '' cp ${jamTop} Jamtop diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 52c8e493fdc..40f19dc89e0 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ python ]; - buildNativeInputs = [ pandoc zip ]; + nativeBuildInputs = [ pandoc zip ]; patchPhase = '' rm youtube-dl |