diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2020-12-31 14:48:55 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-01 11:52:33 +0700 |
commit | b04fc593e7b55fe1f74421b11589f12a339c92e2 (patch) | |
tree | fa9bbaeb68f1e0cfa6ea2f9580ea2892eed41b3e /pkgs/applications/science | |
parent | 54ab07c1fe4e39c5a84834f85300c63e3809ac2d (diff) |
treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
Diffstat (limited to 'pkgs/applications/science')
15 files changed, 30 insertions, 31 deletions
diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index 566fd61f1a7b5..ca8651aa9e621 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - makeWrapper cmake curl boost gdal glew soil libX11 libXi libXxf86vm libXcursor libXrandr libXinerama ]; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 41805c15aed59..7aef4c0728193 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; }; - buildInputs = [cmake]; + nativeBuildInputs = [ cmake ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix index 17d9c3dbb55cd..298bb98ec990c 100644 --- a/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./somatic-sniper.patch ]; - buildInputs = [ cmake zlib ncurses ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ncurses ]; enableParallelBuilding = false; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 9b6e75c77ba85..a50609e84a8c3 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake, graphviz, pkgconfig }: +{ stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: stdenv.mkDerivation rec { name = "qfsm-0.54.0"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ qt4 cmake graphviz ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qt4 graphviz ]; patches = [ ./drop-hardcoded-prefix.patch @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = { description = "Graphical editor for finite state machines"; homepage = "http://qfsm.sourceforge.net/"; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 62a9ae8b73bee..9b143f1c3f1ff 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { ./cmakelists.patch ]; - buildInputs = [ flex bison qt4 libX11 cmake gperf adms ]; + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ qt4 libX11 gperf adms ]; meta = { description = "Integrated circuit simulator"; diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 6b48c1e344883..6f8120c7b8e7c 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ cmake zlib boost.out boost.dev ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib boost.out boost.dev ]; NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things ++ stdenv.lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 612c9d6f92a2c..9ac4f2a6c6bbe 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { sha256 = "1xv3j487zhh1zf2b4v19xzw63s2sgjhg8d62a0kxxyknfmdf3khl"; }; - buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake makeWrapper ninja ]; + buildInputs = [ gmp mpfr python gperftools ]; preConfigure = '' patchShebangs bin/leantags diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index eb83eaf79c55d..584988f2b408e 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ cmake libGLU libGL qt5.qtbase boost ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libGL qt5.qtbase boost ]; meta = with stdenv.lib; { description = "A toolset for model-checking concurrent systems and protocols"; diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 63440213920ce..19fba6e299360 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -31,7 +31,8 @@ let core = stdenv.mkDerivation { name = "${pname}-${version}"; inherit src patches; - buildInputs = [ cmake zlib gmp jdk8 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib gmp jdk8 ]; cmakeFlags = [ "-DBUILD_STATIC=OFF" diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index a2c26de7a2dcf..f5ead883799f2 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { CCACHE_DISABLE="1"; CCACHE_DIR=".ccache"; + nativeBuildInputs = [ cmake ]; buildInputs = with lib; [ - blas lapack bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 4bef967bc08a5..ade58b28ab64b 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ - qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj cmake python2 + qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2 doxygen graphviz gmp mpfr (boost.override { enablePython = true; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index cab26577bd0b8..a800a1938c831 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 +{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 , libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl_1, xxHash , Cocoa, OpenGL, noSplash ? false }: @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ln448lszw4d6jmbdphkr2plwxxlhmjkla48vmmq750xc1lxlfrc"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 0d749bb9be4fc..6f7735db82e08 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { ln -sv "${externals}" externals ''; - buildInputs = [ cmake qt4 libGLU libGL ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 libGLU libGL ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix index 6623f5def4cb7..0acf0989c6364 100644 --- a/pkgs/applications/science/programming/scyther/cli.nix +++ b/pkgs/applications/science/programming/scyther/cli.nix @@ -6,12 +6,8 @@ stdenv.mkDerivation { inherit src meta; - buildInputs = [ - cmake - glibc.static - flex - bison - ]; + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ glibc.static ]; patchPhase = '' # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index df2c569a31c75..aa0062f8f3ac9 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a"; }; - buildInputs = [ cmake ace ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ace ]; cmakeFlags = [ "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON" |