diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 12:41:13 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 12:43:00 +0100 |
| commit | 0d72174dbd7b3d8f01f7c369059854eee9d1346f (patch) | |
| tree | cfb37fdbe02c3973f44d2b2428b0b8c4759d85d6 /pkgs/applications/science | |
| parent | 0cddd5787f834fab1dda943cf47d2f129c4d8499 (diff) | |
| parent | aacca1902cbb7117d978199323cf7bc1ffa4ee97 (diff) | |
| download | nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.gz nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.bz2 nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.lz nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.xz nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.zst nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.zip | |
Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it Conflicts: pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer) pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
Diffstat (limited to 'pkgs/applications/science')
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index b444783ba21d..f4b353296fdc 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 081d2bd62530..9bffc5548dd0 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cln ]; buildInputs = [ readline ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-rpath"; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index 7b97e1a82c00..acc4740eb6b4 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # Perl is only for the documentation - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; patches = [ ./gcc43.patch ]; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 0ea871260fda..84da60398227 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ]; - buildNativeInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper ]; # FIXME: "make check" needs Docbook's DTD 4.4, among other things. doCheck = false; |