diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-03 16:43:56 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-03 18:37:40 +0700 |
| commit | 3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af (patch) | |
| tree | e1ef883cca4049653aabfc8409cd6e7d51f1de92 | |
| parent | fb2311d4307f9873ccd38c7f080fbf1df8f17daa (diff) | |
| download | nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.gz nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.bz2 nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.lz nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.xz nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.zst nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.zip | |
treewide: remove enableParallelBuilding = true if using cmake
378 files changed, 15 insertions, 724 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 85806ca9a0d..bbdcbc21b78 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -75,8 +75,6 @@ in mkDerivation { nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index d9d1a11ce1d..042d5b4b13a 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -79,8 +79,6 @@ let "-DSPOTIFY_BLOB=OFF" ]; - enableParallelBuilding = true; - passthru.unfree = unfree; postInstall = '' @@ -122,7 +120,7 @@ let ln -s "${free}/share/$dir" "$out/share/$dir" done ''; - enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://www.clementine-player.org"; description = "Spotify integration for Clementine"; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index d91e550334b..e7d264675e2 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { # version and remove fluidsynth 1.x from nixpkgs again. version = "6.15.0"; - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index f4f76d2030e..84894aeee5c 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/" ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A simple and powerful audio tag editor"; longDescription = '' diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index b01c4055e40..8513c1aae78 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -37,7 +37,6 @@ mkDerivation rec { ]; cmakeFlags = [ "-DWANT_QT5=ON" ]; - enableParallelBuilding = true; meta = with stdenv.lib; { description = "DAW similar to FL Studio (music production software)"; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index e6f41711fdf..2863ae3a61c 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -51,8 +51,6 @@ mkDerivation rec { libsamplerate ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Qt-based audio player that looks like Winamp"; homepage = "http://qmmp.ylsoftware.com/"; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 014906594a7..8b61bc07a69 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - checkInputs = [ gtest ]; doCheck = !stdenv.isAarch64; # single failure that I can't explain diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 8bda179df14..416f4906d6e 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation (rec { alsaLib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://www.rosegardenmusic.com/"; description = "Music composition and editing environment"; diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 992dd728e76..e8704ff6191 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { stripLen = 1; }) ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; buildInputs = [ taglib ] ++ runtimeDeps; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 63ba44bec35..94bce19b7e1 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -18,7 +18,6 @@ mkDerivation { cmakeFlags = [ "-DWANT_PORTAUDIO=1" "-DWANT_PULSEAUDIO=1" "-DWANT_MP3_ENCODE=1" "-DWANT_LV2=0" ]; - enableParallelBuilding = true; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 81825d3d5b0..d2b69a32ab5 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -32,8 +32,6 @@ mkDerivation rec { find ./. -type f -iname "*.sh" -exec chmod +x {} \; ''; - enableParallelBuilding = true; - meta = { description = "Peer-to-peer electronic cash system (Cash client)"; longDescription= '' diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix index 8aa693d2871..373170fe8ff 100644 --- a/pkgs/applications/blockchains/dero.nix +++ b/pkgs/applications/blockchains/dero.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - enableParallelBuilding = true; - meta = with lib; { description = "Secure, private blockchain with smart contracts based on Monero"; homepage = "https://dero.io/"; diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix index dfa005abb6e..25301a87aea 100644 --- a/pkgs/applications/blockchains/masari.nix +++ b/pkgs/applications/blockchains/masari.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - enableParallelBuilding = true; - meta = with lib; { description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; homepage = "https://www.getmasari.org/"; diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix index beb294d2dfe..ee817b58195 100644 --- a/pkgs/applications/blockchains/sumokoin.nix +++ b/pkgs/applications/blockchains/sumokoin.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { "-DLMDB_INCLUDE=${lmdb}/include" ]; - enableParallelBuilding = true; - meta = with lib; { description = "A fork of Monero and a truely fungible cryptocurrency"; homepage = "https://www.sumokoin.org/"; diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 4ba8932fec2..b44dc7c6d4f 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -96,8 +96,6 @@ stdenv.mkDerivation rec { rm -rf "$out"/include "$out"/lib ''; - enableParallelBuilding = true; - passthru = { inherit skia; }; meta = with lib; { diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b546aae790a..b4ad25f60c2 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -48,7 +48,6 @@ in ]; dontFixCmake = true; - enableParallelBuilding = true; buildInputs = [ gperf diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 323f08c23f8..5a75a9284f0 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -27,8 +27,6 @@ let nativeBuildInputs = [ cmake doxygen ]; - enableParallelBuilding = true; - preCheck = '' # The GUI tests require a running X server, disable them sed -i ../test/CMakeLists.txt \ diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3fe845a067b..97e8378d94e 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -109,8 +109,6 @@ mkDerivation rec { popd ''; - enableParallelBuilding = true; - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 18437f5ff49..6bf1ca5ada3 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -36,8 +36,6 @@ mkDerivation rec { ''${qtWrapperArgs[@]} ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = "https://github.com/Sigil-Ebook/Sigil/"; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 9c37d00c9ee..f967f28f4df 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -31,8 +31,6 @@ mkDerivation { sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ guile_1_8 diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 363f3b8c84d..95be29abba5 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -40,8 +40,6 @@ in "-DGITBRANCH=${gitBranch}" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A computer-aided design (CAD) tool from a parallel universe"; homepage = "https://github.com/mkeeter/antimony"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 1e4b397db23..8196d8008f7 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -109,8 +109,6 @@ mkDerivation rec { threadweaver ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 7314ff893b0..1a8a552aa4f 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 9b96b30c62b..eaef8c13b7c 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -27,8 +27,6 @@ mkDerivation rec { kconfig kinit kio kparts kwidgetsaddons ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A Graphviz dot graph viewer for KDE"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 50962d54eb2..67b64ee575c 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -84,8 +84,6 @@ mkDerivation rec { # | hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = { description = "A system for processing and editing 3D triangular meshes"; homepage = "https://www.meshlab.net/"; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index d23c02dbbdf..d79a3566574 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -27,8 +27,6 @@ mkDerivation rec { sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; }; - enableParallelBuilding = true; - setSourceRoot = '' sourceRoot=$(echo */ImageLounge) ''; diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 09b5bd37839..3c89f3ffac0 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation { buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 71c63bc82aa..4f470b014af 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -37,8 +37,6 @@ mkDerivation rec { export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" ''; - enableParallelBuilding = true; - meta = { homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 4371bc5838e..14a46bbfcc8 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake ''; - enableParallelBuilding = true; - meta = { description = "RAW converter and digital photo processing software"; homepage = "http://www.rawtherapee.com/"; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index c1255c016f4..c2edecb858f 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -61,8 +61,6 @@ mkDerivation rec { addOpenGLRunpath $out/lib/librenderdoc.so ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A single-frame graphics debugger"; homepage = "https://renderdoc.org/"; diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index c776aec3c42..5e05072f7b5 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ qt4 libjpeg libtiff boost ]; - enableParallelBuilding = true; - meta = { homepage = "http://scantailor.org/"; description = "Interactive post-processing tool for scanned pages"; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index bd084b4287d..18d8d546a77 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { json_c fontconfig gtkmm3 pangomm glew libGLU xorg.libpthreadstubs xorg.libXdmcp pcre ]; - enableParallelBuilding = true; preConfigure = '' patch CMakeLists.txt <<EOF diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 5c43d717913..9f4fc95df77 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -18,8 +18,6 @@ mkDerivation rec { buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 qtcharts ]; - enableParallelBuilding = true; - # We don't have virtualbox sdk so disable plugin cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 9796aef9b7c..6174dceaef9 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -119,8 +119,6 @@ stdenv.mkDerivation rec { # libstdc++ in our RPATH. Sigh. NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; - enableParallelBuilding = true; - blenderExecutable = placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); # --python-expr is used to workaround https://developer.blender.org/T74304 diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/applications/misc/elf-dissector/default.nix index 36ceb49d5c4..6edbcc0cce2 100644 --- a/pkgs/applications/misc/elf-dissector/default.nix +++ b/pkgs/applications/misc/elf-dissector/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://invent.kde.org/sdk/elf-dissector"; description = "Tools for inspecting, analyzing and optimizing ELF files"; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index de2ed0d1596..eb7314a870d 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -76,8 +76,6 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" "share" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "An orthodox file manager"; homepage = "https://github.com/elfmz/far2l"; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index ff3408eb8dd..6f1b824925f 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { ++ optionals dbiSupport [ libdbi libdbiDrivers ] ++ optionals postgresSupport [ postgresql ]; - enableParallelBuilding = true; - meta = { homepage = "https://wammu.eu/gammu/"; description = "Command line utility and library to control mobile phones"; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 2280f9a471e..2f513634259 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p"; }; - enableParallelBuilding = true; - patches = [ (fetchpatch { url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch"; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 6bdcd0da1fc..770d12d2722 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 79ad84e99be..d715e08fbe0 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { pname = "prusa-slicer"; version = "2.2.0"; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 6a9de9e600f..0e0ddffaac0 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { "-DNO_GTEST=ON" "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" ]; - enableParallelBuilding = true; postPatch = '' # Fix perl scripts used during the build. diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix index 9ae65a962dd..cb30571e055 100644 --- a/pkgs/applications/misc/qlandkartegt/default.nix +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -63,8 +63,6 @@ mkDerivation rec { "-DEXIF_INCLUDE_DIRS=${libexif}/include" ]; - enableParallelBuilding = true; - postPatch = '' substituteInPlace ConfigureChecks.cmake \ --replace \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt" diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix index 8705abd9259..22b6dfbf33d 100644 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ libusb-compat-0_1 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "http://www.qlandkarte.org/"; description = "Garmin Device Drivers for QlandkarteGT"; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 913d2bc3c6b..6cdd97e666f 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -17,8 +17,6 @@ mkDerivation { libeb lzo qtbase qtmultimedia qttools qtwebengine ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 70d9f600fa0..cdb4f603821 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -53,8 +53,6 @@ mkDerivation rec { runHook postInstall ''; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/sieren/QSyncthingTray/"; description = "A Traybar Application for Syncthing written in C++"; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index e93baa997c8..f278cf7fd96 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index 1eaf907b7ed..056ba196cf5 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index d8773240bac..509f5f55e6d 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -91,8 +91,6 @@ in stdenv.mkDerivation { "-DNO_PRINTING=OFF" ]; - enableParallelBuilding = true; - passthru = { inherit version libdc googlemaps; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 4c577049f44..b7564fd2402 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "tasksh"; version = "1.2.0"; - enableParallelBuilding = true; - src = fetchurl { url = "https://taskwarrior.org/download/${pname}-${version}.tar.gz"; sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 7b1d3c302b1..380f1d437f1 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "timewarrior"; version = "1.4.2"; - enableParallelBuilding = true; - src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index 02559691f4d..a5bd8a02ebf 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ glib libwnck3 ]; - enableParallelBuilding = true; - postInstall = '' wrapProgram $out/bin/xsuspender \ --prefix PATH : "${makeBinPath [ procps ]}" diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 3c2aace79b2..49d67690bf1 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -47,8 +47,6 @@ mkDerivation rec { wrapQtAppsHook ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; homepage = "https://community.kde.org/Incubator/Projects/Falkon"; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 336e3be074d..8fa3a86e5c0 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. inherit preConfigure; - enableParallelBuilding = true; - patches = stdenv.lib.optionals stdenv.cc.isClang [ # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 (fetchpatch { diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 08c3ab96210..62b6c8f8e59 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -21,7 +21,6 @@ mkDerivation rec { qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libXScrnSaver hunspell ]; - enableParallelBuilding = true; meta = with lib; { homepage = "https://psi-im.org"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index d4cc5293a9b..8ea4362e7e3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -52,8 +52,6 @@ in mkDerivation rec { pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst ]; - enableParallelBuilding = true; - cmakeFlags = [ "-Ddisable_autoupdate=ON" # We're allowed to used the API ID of the Snap package: diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 7981644be9f..4afd488c68d 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -49,8 +49,6 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ./0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch ]; - enableParallelBuilding = true; - # Prevent ``undefined reference to `qt_version_tag''' in SSL check NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index d990dfb39d2..ed8826729cc 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -21,8 +21,6 @@ mkDerivation rec { "-DNO_SHIBBOLETH=1" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Synchronise your ownCloud with your computer using this desktop client"; homepage = "https://owncloud.org"; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 9355bfa5b8d..7bb0866e12f 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -54,8 +54,6 @@ stdenv.mkDerivation rec { "-DWITH_LUASCRIPTS=ON" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A cross-platform program that uses the Direct Connect and ADC protocols"; homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp"; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 19be24bd1b1..94a4642b2de 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -22,8 +22,6 @@ mkDerivation rec { libktorrent taglib libgcrypt kplotting ]; - enableParallelBuilding = true; - meta = with lib; { description = "KDE integrated BtTorrent client"; homepage = "https://www.kde.org/applications/internet/ktorrent/"; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 2e69ad23e14..d83cc6ad184 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -44,8 +44,6 @@ mkDerivation rec { else "qbittorrent-nox" } --prefix PATH : ${makeBinPath [ python3 ]}"; - enableParallelBuilding = true; - meta = { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org/"; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 66292e20c52..d57e8272813 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -93,8 +93,6 @@ in stdenv.mkDerivation { cp ../wiretap/*.h $dev/include/wiretap ''); - enableParallelBuilding = true; - dontFixCmake = true; shellHook = '' diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 29a96aac5c4..898ee032fc4 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -82,8 +82,6 @@ stdenv.mkDerivation rec { ''; doCheck = false; - enableParallelBuilding = true; - meta = { description = "Personal and small-business financial-accounting application"; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index e15615f78a3..093d20906a4 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { # Hidden dependency that wasn't included in CMakeLists.txt: NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; - enableParallelBuilding = true; - nativeBuildInputs = [ doxygen extra-cmake-modules graphviz kdoctools python2 python3Packages.wrapPython wrapQtAppsHook diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 543545de263..7f543c9bbcc 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake texinfo ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 779a5cb0fea..4cc20775390 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -18,8 +18,6 @@ in stdenv.mkDerivation rec { sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = with xorg; [ freetype lcms libtiff libxml2 libart_lgpl qt4 diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index c2c300b8748..bb855feebab 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -43,8 +43,6 @@ mkDerivation rec { sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s="; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index a369486278b..1aa04dc43d7 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { mbelib libsndfile itpp ] ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; - enableParallelBuilding = true; - doCheck = true; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index d7e2d44c75c..782640c95df 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -8,7 +8,7 @@ , gflags , gnuradio , orc -, pkgconfig +, pkg-config , pythonPackages , uhd , log4cpp @@ -29,17 +29,16 @@ stdenv.mkDerivation rec { sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby"; }; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ armadillo boost.dev - cmake glog gmock openssl.dev gflags gnuradio orc - pkgconfig pythonPackages.Mako pythonPackages.six @@ -53,8 +52,6 @@ stdenv.mkDerivation rec { protobuf ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DGFlags_ROOT_DIR=${gflags}/lib" "-DGLOG_INCLUDE_DIR=${glog}/include" diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 69b55c77121..82187230ee3 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for ais"; homepage = "https://github.com/bistromath/gr-ais"; diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 541817c18f9..b41e7cdb682 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for gsm"; homepage = "https://github.com/ptrkrysik/gr-gsm"; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index b2f99164bec..f7ec95f8e71 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -28,8 +28,6 @@ in stdenv.mkDerivation { ] ++ stdenv.lib.optionals pythonSupport [ python ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio source and sink blocks for LimeSDR"; homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio"; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index 41c28833a3b..7ddac3c2272 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for encryption"; homepage = "https://github.com/stwunsch/gr-nacl"; diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 7d91b23e7f0..50889c66d6b 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for OsmoSDR and rtl-sdr"; homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 9d73176b929..f28ec8ded2d 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for radio data system"; homepage = "https://github.com/bastibl/gr-rds"; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index e06d04ca53f..31e6bc37540 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -23,8 +23,6 @@ mkDerivation rec { qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; - enableParallelBuilding = true; - postInstall = '' install -vD $src/gqrx.desktop -t "$out/share/applications/" install -vD $src/resources/icons/gqrx.svg -t "$out/share/pixmaps/" diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index e06fcb5d3e6..185e08f4062 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -29,7 +29,6 @@ in stdenv.mkDerivation rec { "-DRTLSDR_INCLUDE_DIRS=${rtl-sdr}/include" "../src" ]; - enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ cmake pkgconfig doxygen groff wrapQtAppsHook ]; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index e7ddb5787fa..d9276f6f1f1 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -54,8 +54,6 @@ stdenv.mkDerivation rec { sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp"; }; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_LIBUHD=ON" "-DENABLE_USB=ON" diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 77969c5ca3f..87c04dd3b98 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -39,8 +39,6 @@ in mkDerivation { "-DRTLSDR=true" "-DSOAPYSDR=true" ]; - enableParallelBuilding = true; - meta = with lib; { description = "A DAB/DAB+ Software Radio"; homepage = "https://www.welle.io/"; diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index a9661ee2db7..f9d3e4d4e12 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { "-DEZMINC_BUILD_MRFSEG=TRUE" "-DEZMINC_BUILD_DD=TRUE" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/BIC-MNI/${pname}"; description = "Collection of Perl and shell scripts for processing MINC files"; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index ece218eea37..caf759ce7e3 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; - enableParallelBuilding = true; - postInstall = '' for file in $out/bin/*; do wrapProgram $file --set ANTSPATH "$out/bin" diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index cfd1206f231..a59e5d2be2d 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake git ]; buildInputs = [ libyamlcpp ]; diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/applications/science/biology/megahit/default.nix index 35ef280ed67..3168ecb1cf8 100644 --- a/pkgs/applications/science/biology/megahit/default.nix +++ b/pkgs/applications/science/biology/megahit/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 201e38cfc53..876cc8ebaa7 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.2.1"; pname = "messer-slim"; src = fetchurl { @@ -9,11 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1j3ssjvxpsc21mmzj59kwimglz8pdazi5w6wplmx11x744k77wa1"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; - cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; meta = { @@ -24,4 +22,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index c594897f4b6..897c1994a50 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/BIC-MNI/minc-tools"; description = "Command-line utilities for working with MINC files"; diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index fd7dc4f1fbb..4e965d70fe3 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg"; diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix index 38194697223..98cca7815ea 100644 --- a/pkgs/applications/science/biology/niftyseg/default.nix +++ b/pkgs/applications/science/biology/niftyseg/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen zlib ]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg"; diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index 076e459c8f0..7ecee60c4b1 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -26,8 +26,6 @@ pythonPackages.buildPythonApplication rec { doCheck = true; - enableParallelBuilding = true; - meta = with stdenv.lib ; { description = "Management of analyses and data in DNA metabarcoding"; homepage = "https://git.metabarcoding.org/obitools/obitools3"; diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index 1c639563757..72962455ac9 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -12,7 +12,6 @@ clangStdenv.mkDerivation rec { sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ]; buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ]; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 317a83371ad..334a85d3a5f 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -38,8 +38,6 @@ in stdenv.mkDerivation { openssh ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DOPENMP=ON" "-DGA=ON" diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index c2d7cefec9b..7aafa70f7fa 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -45,8 +45,6 @@ mkDerivation { rm $out/bin/AppCSXCAD.sh ''; - enableParallelBuilding = true; - meta = with lib; { description = "Minimal Application using the QCSXCAD library"; homepage = "https://github.com/thliebig/AppCSXCAD"; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index c90ceac6788..5cf9ab1ae6f 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase qttools qtsvg qwt ]; - enableParallelBuilding = true; - meta = { description = "Open source EDA software focused on easy of use and portability"; homepage = "http://caneda.org"; diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index adc6a60be85..f1ea9376003 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A C++ library to describe geometrical objects"; homepage = "https://github.com/thliebig/CSXCAD"; diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index e61017ea330..8c5e9e41aac 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -34,8 +34,6 @@ mkDerivation rec { python3 ]; - enableParallelBuilding = true; - meta = with lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; homepage = "https://www.dreamsourcelab.com/"; diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index f7c8dd7467a..e1063f8e26c 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -63,8 +63,6 @@ stdenv.mkDerivation { -o $out/share/openEMS/matlab/h5readatt_octave.oct ''; - enableParallelBuilding = true; - meta = with lib; { description = "Open Source Electromagnetic Field Solver"; homepage = "http://openems.de/index.php/Main_Page.html"; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 426c5a9df32..0e60122a598 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; - enableParallelBuilding = true; installPhase = "mkdir -p $out/bin && mv abc $out/bin"; # needed by yosys diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 54a2f022551..1a92247c54d 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -35,9 +35,6 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Production" ]; - - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; homepage = "http://cvc4.cs.stanford.edu/web/"; diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index a4654209537..cc14fd7706a 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { cmakeFlags = lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; - enableParallelBuilding = true; - configurePhase = '' python build.py release ''; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 88e1b4fbc0e..0ed3a544c77 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gmp ]; - enableParallelBuilding = true; cmakeDir = "../src"; diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index dd00eda1b57..fcffc239b48 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -24,9 +24,6 @@ stdenv.mkDerivation rec { ) ''; - # seems to build fine now, may revert if concurrency does become an issue - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Simple Theorem Prover"; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index f5ead883799..f448e66d94b 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -88,8 +88,6 @@ stdenv.mkDerivation rec { (flag "OpenCV" opencvSupport) ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4a6a2dc6c7e..c99adea9a64 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake doxygen ]; cmakeFlags = diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 401454a6b69..a348210179e 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -90,8 +90,6 @@ in stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with lib; { # Newer cub is included with cudatoolkit now and it breaks the build. # https://github.com/Microsoft/CNTK/issues/3191 diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 3d74421669e..68df53aee39 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -43,8 +43,6 @@ stdenv.mkDerivation rec { rm "$out"/lib/*.a ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; homepage = "https://mxnet.incubator.apache.org/"; diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 268ae53401f..589b1370023 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - patchPhase = '' cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh cp -fv ${fakegit}/bin/checkout-svn.sh libraries/checkout-svn.sh diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index efdd86f0ab2..f8533677b7a 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -50,8 +50,6 @@ stdenv.mkDerivation { dontUseCmakeBuildDir = true; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A library for computer-vision scientists and especially targeted to the Multi-View Stereo reconstruction community"; homepage = "http://cdcseacave.github.io/openMVS/"; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index a800a1938c8..c42f80da352 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -77,8 +77,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; - enableParallelBuilding = true; - setupHook = ./setup-hook.sh; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 03b20697310..2e9fcdb35a2 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; - enableParallelBuilding = true; - postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 11d73095834..7cc702f2d53 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -92,8 +92,6 @@ stdenv.mkDerivation rec { EOW ''; - enableParallelBuilding = true; - meta = { description = "Framework for the simulation of distributed applications"; longDescription = '' diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index a76fe3a7277..7e10ecaba36 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { ./fix-cmake.patch ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://elmerfem.org/"; description = "A finite element software for multiphysical problems"; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index a60250ee0ff..b295e892248 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -83,7 +83,6 @@ let repo = name; inherit rev sha256; }; - enableParallelBuilding = true; } // attrs'); ffmpeg = kodiDependency rec { @@ -242,8 +241,6 @@ in stdenv.mkDerivation { "-DGBM_RENDER_SYSTEM=gles" ]; - enableParallelBuilding = true; - # 14 tests fail but the biggest issue is that every test takes 30 seconds - # I'm guessing there is a thing waiting to time out doCheck = false; diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix index 7e33d371ebe..04986b7dcc5 100644 --- a/pkgs/data/themes/kde2/default.nix +++ b/pkgs/data/themes/kde2/default.nix @@ -15,7 +15,6 @@ mkDerivation rec { }; outputs = [ "out" "dev" ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index cd5cb4170b8..a65a24dc0b6 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -17,8 +17,6 @@ mkDerivation rec { sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo="; }; - enableParallelBuilding = true; - patches = [ # Remove unnecessary constexpr, this is not allowed in C++14 (fetchpatch { diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 61e9d94acc5..83891fe48dd 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { gtk3 ]; - enableParallelBuilding = true; - passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.thunar-dropbox-plugin"; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index b3364b185da..3b0084e3aee 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake python3 bison jq ]; - enableParallelBuilding = true; postPatch = '' cp --no-preserve=mode -r "${localSpirv-tools.src}" External/spirv-tools diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index a98b69f50e9..0325632ad0a 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -171,8 +171,6 @@ stdenv.mkDerivation rec { openspecfun pcre2 ]); - enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; checkTarget = "testall"; # Julia's tests require read/write access to $HOME diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index 406ea73f2ae..8096af0b320 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -119,8 +119,6 @@ stdenv.mkDerivation rec { openspecfun pcre2 lapack ]; - enableParallelBuilding = true; - # Other versions of Julia pass the tests, but we are not sure why these fail. doCheck = false; checkTarget = "testall"; diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index 151cf83cece..be3cfc39635 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -119,8 +119,6 @@ stdenv.mkDerivation rec { openspecfun pcre2 lapack ]; - enableParallelBuilding = true; - # Julia's tests require read/write access to $HOME preCheck = '' export HOME="$NIX_BUILD_TOP" diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index 214d64cfa76..19dc140a7e1 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { pname = "ldc"; inherit version; - enableParallelBuilding = true; - src = fetchurl { url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; sha256 = ldcSha256; diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index fef7720d726..d01d1a2a53d 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -82,8 +82,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index e6882cbabb8..568bdff67c0 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -87,5 +87,4 @@ stdenv.mkDerivation rec { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 95711903932..ed1444a374b 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix index b13bacb3638..77a2271048a 100644 --- a/pkgs/development/compilers/llvm/10/libunwind.nix +++ b/pkgs/development/compilers/llvm/10/libunwind.nix @@ -8,7 +8,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix index 5d513462820..a0cb9c117a8 100644 --- a/pkgs/development/compilers/llvm/10/lld.nix +++ b/pkgs/development/compilers/llvm/10/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index c728efeb2a9..fc5edadd0a4 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_HTML=OFF" ]; - enableParallelBuilding = true; - postInstall = '' # Editor support # vscode: diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 7394d4033d2..7e6c7c02526 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -154,8 +154,6 @@ in stdenv.mkDerivation (rec { checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix index 0927448d2b4..e3c1e66376a 100644 --- a/pkgs/development/compilers/llvm/10/openmp.nix +++ b/pkgs/development/compilers/llvm/10/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 2de5f65b4a1..aed5b66368f 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -81,8 +81,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index b8a5fcd5661..9a596e00e1b 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -86,5 +86,4 @@ stdenv.mkDerivation rec { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index 1ce879cccb6..bbc851c7f04 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix index 5a4492e803f..a0b6221dc12 100644 --- a/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/pkgs/development/compilers/llvm/11/libunwind.nix @@ -8,7 +8,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/11/lld.nix b/pkgs/development/compilers/llvm/11/lld.nix index 20eb87c548f..81b829a2898 100644 --- a/pkgs/development/compilers/llvm/11/lld.nix +++ b/pkgs/development/compilers/llvm/11/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix index 0ae55d45349..0282037c092 100644 --- a/pkgs/development/compilers/llvm/11/lldb.nix +++ b/pkgs/development/compilers/llvm/11/lldb.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_HTML=OFF" ]; - enableParallelBuilding = true; - postInstall = '' # Editor support # vscode: diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix index c2b70a149bf..4ec4104b6fa 100644 --- a/pkgs/development/compilers/llvm/11/llvm.nix +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -156,8 +156,6 @@ in stdenv.mkDerivation (rec { checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/11/openmp.nix b/pkgs/development/compilers/llvm/11/openmp.nix index 5fd6c62840d..ae0ddcb1767 100644 --- a/pkgs/development/compilers/llvm/11/openmp.nix +++ b/pkgs/development/compilers/llvm/11/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index b5e7b54fa5b..a097e9167cd 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -72,8 +72,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 41f2b24b057..e973be0a087 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -84,5 +84,4 @@ stdenv.mkDerivation { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 9bebedbc044..687a613e074 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation { "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index 3d9ed6ee663..5f43f8235e1 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index e827f76231f..258535a7566 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -51,8 +51,6 @@ stdenv.mkDerivation { "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ]; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 987e6258527..2c2867c9937 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -146,8 +146,6 @@ stdenv.mkDerivation ({ checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index da328de24d1..452f5a3cfe5 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index ec3effebfd7..63a79ffba8a 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -72,8 +72,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 8bd61f5d7f7..df61824e908 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -86,5 +86,4 @@ stdenv.mkDerivation { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 727a3226087..129d06fe515 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation { "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 81b94df3119..da1acf3f5f3 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 629749e10f3..0a138618574 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -51,8 +51,6 @@ stdenv.mkDerivation { "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ]; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 22dbb75d2d5..07aaf1e9218 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -145,8 +145,6 @@ stdenv.mkDerivation ({ checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index c1a4480a552..d6b00bb01ae 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 969938681fe..0b1fdd53de9 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -83,8 +83,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index ec9b7e6e6ad..bae9cf5fa0e 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -89,5 +89,4 @@ stdenv.mkDerivation { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 76baadf1c6e..126671d0fbd 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index bee9202ed6c..5e0568b6a09 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index 8fadd3cf784..d1508c46d0c 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -52,8 +52,6 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index dc57d0d6bd5..69114c7ca23 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -167,8 +167,6 @@ in stdenv.mkDerivation ({ checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index 898d49dce83..e36b236fd02 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 5c1dca5e33b..0c00ce62715 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -93,8 +93,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 3c6265c4fca..280204c6e35 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -87,5 +87,4 @@ stdenv.mkDerivation { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 01e0d8e008c..31853e5f91a 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 646cd3c3ca4..d384a6f342a 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -19,7 +19,5 @@ stdenv.mkDerivation { }) ]; - enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index ba9cf3c57d7..f890591b377 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index 298ce737fc7..a22d27f9b29 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -41,8 +41,6 @@ stdenv.mkDerivation { "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ]; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index fb928b67ad5..e3ca31313ce 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -151,8 +151,6 @@ in stdenv.mkDerivation ({ checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 42cc7adf4f0..4eb43600dd6 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index cfaee05944c..b880d843d59 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -88,8 +88,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index 13b0b522771..709d0c13477 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -85,6 +85,4 @@ stdenv.mkDerivation rec { ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; - - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index c9f0e6254ab..23265ed0d35 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind.nix index 883c36baf06..0226d917e0b 100644 --- a/pkgs/development/compilers/llvm/9/libunwind.nix +++ b/pkgs/development/compilers/llvm/9/libunwind.nix @@ -8,7 +8,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix index 488870e729a..a2b17a97cdc 100644 --- a/pkgs/development/compilers/llvm/9/lld.nix +++ b/pkgs/development/compilers/llvm/9/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix index a8e193c27b1..9c43287b166 100644 --- a/pkgs/development/compilers/llvm/9/lldb.nix +++ b/pkgs/development/compilers/llvm/9/lldb.nix @@ -49,8 +49,6 @@ stdenv.mkDerivation rec { "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" ]; - enableParallelBuilding = true; - postInstall = '' # man page mkdir -p $out/share/man/man1 diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index 013e5bb36b9..c46e54debe9 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -159,8 +159,6 @@ in stdenv.mkDerivation (rec { checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix index 84f898ec06a..9fdcf9e6cff 100644 --- a/pkgs/development/compilers/llvm/9/openmp.nix +++ b/pkgs/development/compilers/llvm/9/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index b87bec7ea2d..728049448e6 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ]; preConfigure = "cd dev"; - enableParallelBuilding = true; passthru = { tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 71405f30d5c..0a0f232227d 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -41,8 +41,6 @@ stdenv.mkDerivation { "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; - enableParallelBuilding = true; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies - Mono build"; homepage = "http://llvm.org/"; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 664ceb79636..3e33842432d 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -43,7 +43,6 @@ with stdenv; mkDerivation rec { ++ (lib.optional enableGui qtbase) ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); - enableParallelBuilding = true; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}" "-DARCH=generic;ice40;ecp5" diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index f9e4ad742cf..df80fe2fdb6 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -83,8 +83,6 @@ stdenv.mkDerivation (rec { ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; - enableParallelBuilding = true; - doCheck = true; NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 4687ce86a90..e94ebab50e6 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { unix/cmake/configure --prefix=$out --enable-mpg-{mmx,pthreads} ''; - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index acdffba8d72..113eb54a00b 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, alsaLib +{ stdenv, fetchurl, cmake, pkgconfig, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -7,7 +7,7 @@ let optional = stdenv.lib.optional; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "supercollider"; version = "3.11.2"; @@ -26,8 +26,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] ++ optional (!stdenv.isDarwin) alsaLib diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 126300aa194..db22f463df0 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec nativeBuildInputs = [ unzip cmake ]; buildInputs = [ openexr hdf5-threadsafe ]; - enableParallelBuilding = true; - buildPhase = '' cmake -DUSE_HDF5=ON -DCMAKE_INSTALL_PREFIX=$out/ -DUSE_TESTS=OFF . diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 9dd4b1b93a9..3e678c8544e 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { export CUDA_PATH="${cudatoolkit}" ''; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix index 1fda3a91926..993bbcd09c1 100644 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ b/pkgs/development/libraries/audio/mbelib/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - doCheck = true; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index c147b3f0b5e..9ac609f1679 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation { substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE" ''; - enableParallelBuilding = true; - meta = { description = "A C++ library which implements parts of the Avro Specification"; homepage = "https://avro.apache.org/"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index d96930f37f2..99f8d7f8497 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -19,8 +19,6 @@ in stdenv.mkDerivation { buildInputs = [ jansson zlib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A C library which implements parts of the Avro Specification"; homepage = "https://avro.apache.org/"; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 89ef702f4e5..5273ef0c568 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { patches = [ ./clang_llvm.patch ]; - enableParallelBuilding = true; - postPatch = '' substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" patchShebangs src/git_sha1.sh @@ -66,8 +64,6 @@ stdenv.mkDerivation rec { cd utests ''; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake python3 diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 20524cf179c..eb13321523d 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake perl go ]; - enableParallelBuilding = true; makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ]; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 1c9a10356a4..07222f469d1 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { "-DBUILD_UNIT_TESTS=OFF" ]; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing"; diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index abb9d3e2ce3..1387048070f 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation { "-DBUILD_UNIT_TESTS=OFF" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 20b82df6169..7dfcce8e9d8 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A blocking, shuffling and loss-less compression library"; homepage = "https://www.blosc.org"; diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 47ec7a1a6eb..e084343a94c 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl leatherman ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A C++ port of the Typesafe Config library"; diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index 3dc4b462404..bd42a9c866e 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix index 810bd3f15da..46f1eb33f75 100644 --- a/pkgs/development/libraries/curlpp/default.nix +++ b/pkgs/development/libraries/curlpp/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ curl ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "https://www.curlpp.org/"; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 43ac2530cc1..c4d441df5a9 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index d647d5f3888..83f32b51a1d 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/onqtam/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index ecd5ee67cf6..fd7a4e3f5f6 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { rm BUILD ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; homepage = "https://github.com/google/double-conversion"; diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index 317742f07b3..8479f3c2f8e 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "14ln4la52x38pf8syr7i5v4vd65ya4zij8zj5kgihah03cih0qcd"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 5cef17f1119..25ecbf03dc1 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index e3bed618630..867f0e59393 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { "-DENABLE_ECCODES_OMP_THREADS=${if enableOpenMPThreads then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - doCheck = true; # Only do tests that don't require downloading 120MB of testdata diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 22d3bd889e1..d76772500fb 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Freundlich's C++ toolkit"; longDescription = '' diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 424aeb8637d..6f19c15945c 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6d4e560e93b..bb61231d445 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -23,8 +23,6 @@ in stdenv.mkDerivation { "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index c1b9318130c..1dc9633d1a7 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; homepage = "https://www.freetds.org"; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 0eff8eafacf..ab6a379116d 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { chmod -R u+w googletest ''; - enableParallelBuilding = true; doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 96b67c7ccca..edbb3d82241 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - enableParallelBuilding = true; - doCheck = false; # hangs. or very expensive? meta = { diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index fbc1cb818ca..62c1c596d2c 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "0b5lsxz1xkzip7fvbicjkxvg5ig8gbhx1zrlhandqc0rpk56bvyw"; }; - enableParallelBuilding = true; - propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake ] diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix index df3581cc809..f8211b89d77 100644 --- a/pkgs/development/libraries/hotpatch/default.nix +++ b/pkgs/development/libraries/hotpatch/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { sha256 = "169vdh55wsbn6fl58lpzqx64v6ifzh7krykav33x1d9hsk98qjqh"; }; - enableParallelBuilding = true; doCheck = true; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix index 112b77650d2..7a7176c88c1 100644 --- a/pkgs/development/libraries/itk/4.x.nix +++ b/pkgs/development/libraries/itk/4.x.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { "-DModule_ITKReview=ON" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake xz ]; buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index c0416b23dc2..598ad52de04 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { "-DModule_ITKReview=ON" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake xz makeWrapper ]; buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 5bd311af2d8..f00d7e59b74 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh"; }; - enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 1c00b6be2f2..d2677f69f9f 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { maintainers = with lib.maintainers; [ peterhoeg ]; # The build requires at least Qt 5.14: diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index a1de88ef1ca..7f1c292c5f1 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/puppetlabs/leatherman/"; description = "A collection of C++ and CMake utility libraries"; diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index cde046bf132..957daf7dc41 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ qt4 qjson ]; - enableParallelBuilding = true; doCheck = false; # requires network access meta = { diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index c0aa67238bf..b3d58c446cf 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DINSTALL_CMAKE_MODULESDIR=lib/cmake" "-DINSTALL_PKGCONFIGDIR=lib/pkgconfig" diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index eec93ef11a8..2b56590df5d 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -56,8 +56,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ jsoncpp argtable curl libmicrohttpd doxygen catch ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "C++ framework for json-rpc (json remote procedure call)"; homepage = "https://github.com/cinemast/libjson-rpc-cpp"; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 19c24ec3754..9aea99f6a40 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -23,8 +23,6 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp boost ]; - enableParallelBuilding = true; - passthru = { inherit mainVersion; }; diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index e9b47e6d406..91843163176 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen boost ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3" ]; diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 3916ff35f69..12f1038f8e1 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium openssl protobuf protobufc ]; separateDebugInfo = true; - enableParallelBuilding = true; outputs = [ "out" "dev" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 20b2988417c..3a90f28e757 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen boost libnabo ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3" ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 1f6313d8caa..fdd762fef07 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -40,8 +40,6 @@ let substituteInPlace ./tls/tls_config.c --replace '"/etc/ssl/cert.pem"' '"${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; - enableParallelBuilding = true; - outputs = [ "bin" "dev" "out" "man" "nc" ]; postFixup = '' diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index a9a17eca786..4de2f1f8d3f 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://rime.im/"; description = "Rime Input Method Engine, the core library"; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index bde1cbf44e1..d70921e3354 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { "--with-boost=${boost.dev}" ]; - enableParallelBuilding = true; doCheck = true; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 6d170c798d0..42c35e68edd 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -28,8 +28,6 @@ let nativeBuildInputs = [ cmake pkgconfig ]; - enableParallelBuilding = true; - doCheck = false; # hangs, tries to access the net? checkInputs = [ check ]; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 3bc5f137091..6515a51f137 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/selmf/unarr"; description = "A lightweight decompression library with support for rar, tar and zip archives"; diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 59e349b4e6a..7dac3315285 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl leatherman ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Library to report hypervisor information from inside a VM"; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 246bdb1480c..4821b9865b2 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1khzclkrd1yn9mz3g14ndgpsbj8j50v8dsjarcj6kkn9zgbbazc4"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; buildInputs = [ hdf5 ]; diff --git a/pkgs/development/libraries/metal/default.nix b/pkgs/development/libraries/metal/default.nix index 7e047c28d0a..090fd46640e 100644 --- a/pkgs/development/libraries/metal/default.nix +++ b/pkgs/development/libraries/metal/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Single-header C++11 library designed to make you love template metaprogramming"; homepage = "https://github.com/brunocodutra/metal"; diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 7382ed57c64..fcc44062b51 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja ]; - enableParallelBuilding = true; cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ]; postInstall = let diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 7bcbff78767..f8ec278ea78 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -75,8 +75,6 @@ mkDerivation rec { CXXFLAGS = "-std=c++11"; - enableParallelBuilding = true; - qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 4cb743a38f8..d7d79de8b2b 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -11,12 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - cmakeFlags = [] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "-DMSGPACK_BUILD_EXAMPLES=OFF" - ; + cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF"; meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index 977bdf9afe3..beedfe521df 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { NIX_ENFORCE_NO_NATIVE=! enableAVX; __AVX2__ = if enableAVX then 1 else 0; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/yahoojapan/NGT"; description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data"; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 84b86b47157..34c0f6294af 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DBuildTests=${if doCheck then "ON" else "OFF"}" "-DJSON_MultipleHeaders=ON" diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index b0a9227b8c9..bc6ceff8378 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - enableParallelBuilding = true; - postPatch = '' rm -rf external/Catch2 ln -sf ${catch2.src} external/Catch2 diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index a2bdbc798eb..577f56e8c27 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { moveToOutput lib "$lib" ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A set of cuda-enabled texture tools and compressors"; homepage = "https://github.com/castano/nvidia-texture-tools"; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index e4dc186f389..9a8c092406c 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ]; - enableParallelBuilding = true; - meta = { description = "Paged Geometry for Ogre3D"; homepage = "https://github.com/RigsOfRods/ogre-paged"; diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index 683f2c43bdc..e9d501f7928 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ "-DBUILD_ASE=1" ]; - enableParallelBuilding = true; meta = with stdenv.lib; { description = "Open Programmable Acceleration Engine SDK"; diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 1516e675d73..3e2d0f6b6e8 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = { description = "Open Source Biometric Recognition"; homepage = "http://openbiometrics.org/"; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 4c88f164b37..a9c26d00e3a 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 pcre ]; - enableParallelBuilding = true; - patchPhase = '' patch -p1 < ${./pcre.patch} '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 2ad2d016c9f..a861591f85f 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -245,8 +245,6 @@ stdenv.mkDerivation { "-DEIGEN_INCLUDE_PATH=${eigen}/include/eigen3" ]; - enableParallelBuilding = true; - postBuild = lib.optionalString enableDocs '' make doxygen ''; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index c6547f118d0..0d225127dd8 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -253,8 +253,6 @@ stdenv.mkDerivation { "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; - enableParallelBuilding = true; - postBuild = lib.optionalString enableDocs '' make doxygen ''; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 56414cfa397..055377b09f5 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -69,8 +69,6 @@ stdenv.mkDerivation rec { (opencvFlag "GSTREAMER" enableGStreamer) ]; - enableParallelBuilding = true; - hardeningDisable = [ "bindnow" "relro" ]; # Fix pkgconfig file that gets broken with multiple outputs diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 080db7fad14..9228424797e 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ]; - enableParallelBuilding = true; - postInstall = "rm $out/lib/*.a"; meta = { diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index f0c4c47db03..415846dd2fa 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL ]; - enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 2b0e15468b1..5fbd9595766 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - enableParallelBuilding = true; - # The tests use cmake's findPackage to find the installed version of # pangolin, which isn't what we want (or available). doCheck = false; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index ba042562320..2f7574d3637 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ unzip cmake doxygen ]; buildInputs = [ freeglut libGLU libGL zlib swig python xorg.libXi xorg.libXmu ]; - enableParallelBuilding = true; - buildPhase = '' make partio diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 753f5ae3911..06f5499b901 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qhull flann boost eigen libusb1 libpcap libpng vtk qtbase libXt ] diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 160f2f64cf4..93c0702e3ef 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -17,8 +17,6 @@ let buildInputs = [ zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - enableParallelBuilding = true; - patchPhase = '' sed s,-Werror,, -i CMakeLists.txt ''; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 7caae2c52d3..0b48b291555 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation rec { "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU xlibsWrapper libXmu ] diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index b2a4fb1b0c3..c0f74630757 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { "-DPOCO_UNBUNDLED=ON" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://pocoproject.org/"; description = "Cross-platform C++ libraries with a network/internet focus"; diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index e8ae15ed31f..e9e67737d32 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gcc ]; buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ]; - enableParallelBuilding = true; meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index bb89d692681..6520d4a64a3 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qt ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - enableParallelBuilding = true; - # tells CMake to use this CA bundle file if it is accessible preConfigure = '' export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index cc6e45e3ebd..5d6f91a7911 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -356,8 +356,6 @@ stdenv.mkDerivation { ] ); - enableParallelBuilding = true; - postInstall = # Move selected outputs. '' diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 3799ccbb59c..47c56aaa1e8 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; checkTarget = "test"; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Experimental range library for C++11/14/17"; homepage = "https://github.com/ericniebler/range-v3"; diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index 4291e11ed33..d010e84f712 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk ''; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gtest ]; buildInputs = [ boost eigen python vtk zlib tbb ]; diff --git a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix index 7e73354363e..a20f6973384 100644 --- a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix +++ b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -37,8 +37,6 @@ mkDerivation { qtbase ]; - enableParallelBuilding = true; - meta = with lib; { description = "Qt library for CSXCAD"; homepage = "https://github.com/thliebig/QCSXCAD"; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 7755efb3065..6b37abf9c69 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -126,7 +126,6 @@ stdenv.mkDerivation rec { ''; doCheck = false; - enableParallelBuilding = true; meta = { homepage = "https://caffe2.ai/"; diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index c74a7408e98..90e0a84e1e2 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { "-DGTEST_DIR:PATH=${gtest.src}/googletest" ]; - enableParallelBuilding = true; - doCheck = true; checkPhase = '' diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 045cccbd2eb..c44e995bfbb 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation { doCheck = true; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 926f7ba4789..0dc77c10c5e 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -53,8 +53,6 @@ stdenv.mkDerivation rec { python.pkgs.protobuf python.pkgs.six ]; - enableParallelBuilding = true; - outputs = [ "out" "python" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 1cf9c2ed8d5..b4d339f6226 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake openssh ]; buildInputs = [ mpi gfortran blas lapack ]; - enableParallelBuilding = true; - doCheck = true; preConfigure = '' diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index e6fb1d7caf7..da25305fc42 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut openscenegraph openal expat apr curl ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Simulation construction toolkit"; homepage = "https://gitorious.org/fg/simgear"; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 2addb86246d..ff8ff83fb9a 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -20,7 +20,6 @@ in stdenv.mkDerivation rec { # On 0.9.7, they do not even build with QT4 cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; - enableParallelBuilding = true; doCheck = false; # giving up for now meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index eb65d07b283..560a991c44a 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -47,8 +47,6 @@ stdenv.mkDerivation rec { gtest ]; - enableParallelBuilding = true; - buildInputs = [ catch2 zlib diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 46a3a3e52f0..119254107e9 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - postPatch = '' sed -i '/OptimizeForArchitecture()/d' cmake/VcMacros.cmake sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 49d3f9af719..d3673e783cd 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - postPatch = '' sed -i '/OptimizeForArchitecture()/d' cmake/VcMacros.cmake sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 16b4b3c3755..7bff0981e76 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -31,8 +31,6 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; - enableParallelBuilding = true; - # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory" doCheck = false; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index f191a976437..6d1dc7d4786 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost lapack ] ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; checkTarget = "test"; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 7bfd8d9fcff..e91d60e00eb 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -84,8 +84,6 @@ in stdenv.mkDerivation rec { sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; - enableParallelBuilding = true; - meta = with lib; { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = "https://www.vtk.org/"; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 8f974307cda..861dd785853 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; - enableParallelBuilding = true; preConfigure = '' substituteInPlace loader/vulkan.pc.in \ diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 4adab259a42..b6543b2e6cf 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation { "-DCMAKE_C_FLAGS=-fPIC" ]; - enableParallelBuilding = true; - meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; homepage = "http://vxl.sourceforge.net/"; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 60b2021f17a..de98a11d68e 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -17,8 +17,6 @@ let inherit sha256; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost doxygen qt48Full libharu diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 3ad200cfc63..8c5cf32545c 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -37,7 +37,6 @@ let buildLib = has12Bit: stdenv.mkDerivation rec { name = "libx265-${if has12Bit then "12" else "10"}-${version}"; inherit src; - enableParallelBuilding = true; postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake @@ -68,8 +67,6 @@ stdenv.mkDerivation rec { pname = "x265"; inherit version src; - enableParallelBuilding = true; - postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake sed -i 's/0.0/${version}/g' source/cmake/version.cmake diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index d9d660062a2..b9a2820a928 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { sha256 = "1zs15k9crkiq7bnr4gqq53mkn3w8z9dq4nwlavmfcr5xr5gw2pw4"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; buildInputs = lib.optional cudaSupport cudatoolkit diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index d5819ff7ee9..7be5a74c3a4 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; - enableParallelBuilding = true; - doCheck = false; # fails all the tests (ctest) cmakeFlags = stdenv.lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index 027500ff2ab..204c1a98542 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -24,6 +24,5 @@ buildPythonPackage { checkInputs = [ pytest more-itertools ]; - enableParallelBuilding = true; dontUseCmakeConfigure = true; } diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index 7d6ceb0cc5a..455f1b4c997 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ python.pkgs.numpy ] ++ stdenv.lib.optionals withMPI [ python.pkgs.mpi4py ]; - enableParallelBuilding = true; - dontAddPrefix = true; cmakeFlags = [ "-DENABLE_MPI=${onOffBool withMPI}" diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 40a4f6f7429..ab431168cee 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -63,8 +63,6 @@ buildPythonPackage rec { Mako ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 07ddfb69fa0..10f030b13f6 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -11,8 +11,6 @@ in stdenv.mkDerivation { sha256 = "1zj8yrxy08iv1pk38djxw3faimm226w6wmi0gm32w4yczblylwz3"; }; - enableParallelBuilding = true; - outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 2bbeb7a1233..08fd8cbfa86 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -11,8 +11,6 @@ buildPythonPackage rec { sha256 = "90f2d736e2192ac69e5a2ac798fce2b5f7bf179269daa2ec262986d488c3b0f7"; }; - enableParallelBuilding = true; - outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 8fc505a89fc..cbc586f4734 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -13,8 +13,6 @@ in stdenv.mkDerivation { sha256 = "0vzk3cp0pfbhd921r8f1xkcz96znla39dhj074k623x9k26lj2sj"; }; - enableParallelBuilding = true; - outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index cf7192f92ff..2690422932f 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ]; buildInputs = [ python libxml2 libxslt ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 218415354db..3a78dd2f202 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -37,8 +37,6 @@ in buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; - enableParallelBuilding = true; - checkPhase = '' runHook preCheck pushd dist diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index bbea8a1dd65..8c75842d1b6 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index b0e5319df2d..1d2255027a4 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -216,8 +216,6 @@ in stdenv.mkDerivation rec { substituteInPlace scripts/retdec-unpacker.py --replace "'upx'" "'${upx}/bin/upx'" ''; - enableParallelBuilding = true; - doInstallCheck = true; installCheckPhase = '' ${python3.interpreter} "$out/bin/retdec-tests-runner.py" diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 2f7ff219081..82eb58879f1 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -19,8 +19,6 @@ mkDerivation rec { export sourceRoot=$sourceRoot/src ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Native code to C/C++ decompiler"; homepage = "http://derevenets.com/"; diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 28df0aaa696..fcab0fb198e 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - enableParallelBuilding = true; - doCheck = true; installPhase = '' diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index bec5357691f..4ac9159520f 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake bison flex ]; buildInputs = [ qtbase capstone ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/BoomerangDecompiler/boomerang"; license = licenses.bsd3; diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index 5694693615d..de01ab93090 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { sed -i '/TrueFalseTest/d' tests/CMakeLists.txt ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index fc6f7156a81..7bc4aca3d9d 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -32,9 +32,6 @@ stdenv.mkDerivation rec { lscpu ${util-linux}/bin/lscpu ''; - - enableParallelBuilding = true; - postInstall = '' wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB" ''; diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index 6b7369a0558..78acf8e17a7 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -14,9 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; buildInputs = [ qt5.qtbase ki18n kconfig kiconthemes kxmlgui kwindowsystem ]; - enableParallelBuilding = true; - - postInstall = '' wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 587896fce68..526e71515ae 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; homepage = "http://uncrustify.sourceforge.net/"; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 0ebeab72df3..464178a11d6 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" ''; - enableParallelBuilding = true; - meta = { description = "C/C++ client-server indexer based on clang"; homepage = "https://github.com/andersbakken/rtags"; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index bac10d24442..6157e3fa0fd 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index c9884a8eacd..db38ac7e77f 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { # TODO: should this be in stdenv instead? "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; - enableParallelBuilding = true; preConfigure = with builtins; '' rmdir database && ln -sfv ${elemAt srcs 1} ./database diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 6e89f03e513..7b1943dd6dd 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -79,8 +79,6 @@ stdenv.mkDerivation rec { wayland ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${localGlslang}" "-DBUILD_LAYER_SUPPORT_FILES=ON" diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 52935c96cdb..b82ee2a3a99 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation { "-DImageMagick_mogrify_EXECUTABLE=${imagemagick.out}/bin/mogrify" ]; - enableParallelBuilding = true; dontWrapQtApps = true; postInstall = '' diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 1735c4380f2..d2e87336e1e 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 libGLU libGL zlib libjpeg libogg libvorbis openal curl ]; - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; meta = with stdenv.lib; { diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 11c21b82c29..b92169fade5 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -146,7 +146,6 @@ let ln -s ${ruby}/lib/libruby-*.so $out/hack/libruby.so ''; - enableParallelBuilding = true; }; in diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 533649131f5..1b097fc7e61 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -79,8 +79,6 @@ stdenv.mkDerivation { install -D -m755 ../build/libgraphics.so $out/lib/libgraphics.so ''; - enableParallelBuilding = true; - # Breaks dfhack because of inlining. hardeningDisable = [ "fortify" ]; diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix index 0158dc2b531..69135029ca6 100644 --- a/pkgs/games/enyo-doom/default.nix +++ b/pkgs/games/enyo-doom/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { buildInputs = [ qtbase ]; - enableParallelBuilding = true; - meta = { homepage = "https://gitlab.com/sdcofer70/enyo-doom"; description = "Frontend for Doom engines"; diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index c170c0b9c18..72e2af9025d 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libGL SDL SDL_mixer SDL_net ]; - enableParallelBuilding = true; - installPhase = '' install -Dm755 source/eternity $out/lib/eternity/eternity cp -r $src/base $out/lib/eternity/base diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index a8aef81523d..2156acf2d90 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -69,8 +69,6 @@ stdenv.mkDerivation rec { "--set FG_ROOT ${data}/share/FlightGear" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Flight simulator"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 27be32071c1..70a207cd798 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -15,16 +15,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - (boost168.override { enablePython = true; }) + (boost168.override { enablePython = true; }) SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU libGL glew ]; nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; - enableParallelBuilding = true; - - patches = [ - ]; - postInstall = '' mkdir -p $out/fixpaths # We need final slashes for XSLT replace to work properly diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index fdbdda2d313..a46d8ce1c2c 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -53,8 +53,6 @@ let zmusic ]; - enableParallelBuilding = true; - NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; installPhase = '' diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 0f9e4b8d67a..4c63ab09bed 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -103,8 +103,6 @@ in env.mkDerivation rec { --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Go engine modeled after AlphaGo Zero"; homepage = "https://github.com/lightvector/katago"; diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index 7ade06393bb..5a5e6442ce7 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Go engine modeled after AlphaGo Zero"; homepage = "https://github.com/gcp/leela-zero"; diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index b73af4515d3..732ead49cc0 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { WITH_FONTS = "NO"; WITH_UPDATER = "NO"; - enableParallelBuilding = true; - installPhase = '' mkdir -pv $out/lib cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog.so $out/lib diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index c114afe9a8e..66138f79e36 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -16,8 +16,6 @@ in mkDerivation rec { nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk zlib ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ]; postInstall = '' diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index af9bccadeb3..ba220a720cd 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ SDL SDL_mixer SDL_net wxGTK30 ]; - enableParallelBuilding = true; - meta = { homepage = "http://odamex.net/"; description = "A client/server port for playing old-school Doom online"; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 18147c896bf..7343c79434f 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -24,8 +24,6 @@ in stdenv.mkDerivation rec { ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 0fe327b308e..a51a0f13cc4 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -31,7 +31,6 @@ in stdenv.mkDerivation { }; dontAddPrefix = true; - enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper cmake ]; buildInputs = [ libjpeg zlib libpng libGL SDL2 ]; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 663e0ecc157..34897c690aa 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { sha256 = "0rm32zsmxvr6b0jjihfj543skhicbw5kg6shjx312clhlm035w2x"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 4f3993973e2..1004be6df7d 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation { "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; - enableParallelBuilding = true; - preFixup = "ln -s $out/share/openrct2 $out/bin/data"; meta = with stdenv.lib; { diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index b00524461a4..2bfdd563c8a 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -55,8 +55,6 @@ stdenv.mkDerivation rec { cp $notoFont $out/share/games/openspades/Resources/ ''; - enableParallelBuilding = true; - NIX_CFLAGS_LINK = "-lopenal"; meta = with stdenv.lib; { diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 3af692d5bf9..3d59fc8afb0 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -24,8 +24,6 @@ let sha256 = "1dszbvxlh1npq4nv9s4wv4lcyfgb01k92ncxrrczsxy1dddg86pp"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 libGL curl ] diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix index 98354a46d4a..091853e485f 100644 --- a/pkgs/games/quake2/yquake2/games.nix +++ b/pkgs/games/quake2/yquake2/games.nix @@ -37,8 +37,6 @@ let rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; installPhase = '' diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 89743c3cf3e..f1e1c50a596 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4"; }; - enableParallelBuilding = true; - installPhase = '' sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg mkdir -p $out/share/rigsofrods diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix index 5ea9b8f5416..247c6575ec3 100644 --- a/pkgs/games/riko4/default.nix +++ b/pkgs/games/riko4/default.nix @@ -15,7 +15,6 @@ let }; buildInputs = [ SDL2 libGLU ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "https://github.com/grimfang4/sdl-gpu"; @@ -57,8 +56,6 @@ stdenv.mkDerivation rec { chmod +x $out/bin/riko4 ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/incinirate/Riko4"; description = "Fantasy console for pixel art game development"; diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index c204846ae2f..c42464feaed 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -22,8 +22,6 @@ mkDerivation rec { openal libmodplug libvorbis qtbase glm ]; - enableParallelBuilding = true; - preFixup = '' mkdir $lib/ mv $out/lib $lib diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 231090419e6..9a93b8ec6b9 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { }) ]; - enableParallelBuilding = true; - postInstall = '' wrapProgram $out/bin/springlobby \ --prefix PATH : "${spring}/bin" \ diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index f6cfb873709..1512359d495 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { ln -s $out/stepmania-5.1/stepmania $out/bin/stepmania ''; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://www.stepmania.com/"; description = "Free dance and rhythm game for Windows, Mac, and Linux"; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 2c686f5724d..1729e2fc285 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -76,8 +76,6 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/supertuxkart --set-default SUPERTUXKART_ASSETS_DIR "${assets}" ''; - enableParallelBuilding = true; - meta = with lib; { description = "A Free 3D kart racing game"; longDescription = '' diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 99599b92dfa..c0c8771032a 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -17,7 +17,6 @@ mkDerivation rec { qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which cmake gettext ]; - enableParallelBuilding = true; installPhase = '' make DESTDIR=.. install diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix index 19c368671e6..c8c26757baf 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -32,8 +32,6 @@ in stdenv.mkDerivation (libs // rec { cmakeFlags = [ "-DQFUSION_GAME=Warsow" ]; - enableParallelBuilding = true; - installPhase = '' mkdir -p $out/lib cp -r libs $out/lib/warsow diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 2f971e12c9f..349338d8830 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; longDescription = '' diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index e499f4ad1fc..1c908ffa1fc 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -53,6 +53,4 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/applications/" cp -v "../debian/org.widelands.widelands.desktop" "$out/share/applications/" ''; - - enableParallelBuilding = true; } diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index bdafff99243..c8d33a19861 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -51,8 +51,6 @@ in stdenv.mkDerivation rec { then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]); - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; installPhase = '' diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index 646021eb2fc..37a8fd0fda8 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { sourceRoot = "."; - enableParallelBuilding = true; - NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ]; preConfigure = '' diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix index e86ebd6dbc2..915967e5ed2 100644 --- a/pkgs/games/zdoom/zdbsp.nix +++ b/pkgs/games/zdoom/zdbsp.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [cmake unzip]; buildInputs = [zlib]; - sourceRoot = "."; - enableParallelBuilding = true; + installPhase = '' install -Dm755 zdbsp $out/bin/zdbsp ''; diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 33ba0bf8676..ccb7d475051 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ alsaLib glib ]; diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix index 829367aa329..422885c73ed 100644 --- a/pkgs/misc/dumb/default.nix +++ b/pkgs/misc/dumb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "dumb"; version = "2.0.3"; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ allegro SDL2 ]; diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index efe4770a7b0..dbfc96c2298 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -11,7 +11,6 @@ mkDerivation { sha256 = "0c1zn1f84h4f6n6p0aqz905yvv5qpdmkj2z58yla6bfgbzabfyrj"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 qtbase qtmultimedia boost ]; diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 65484aab18e..2b392074a51 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -69,8 +69,6 @@ stdenv.mkDerivation rec { "-DENABLE_LTO=True" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 270ffde38bc..697492797fc 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -30,7 +30,6 @@ in stdenv.mkDerivation rec { sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ] ++ lib.optional stdenv.isLinux wrapQtAppsHook; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index af83d4b9f34..10c542c5a6e 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation { install -D ../emulationstation $out/bin/emulationstation ''; - enableParallelBuilding = true; - meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; homepage = "https://emulationstation.org"; diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index e5c972e079d..7e0e9647db2 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -21,7 +21,6 @@ mkDerivation rec { sha256 = "0m45m1ch0az8l3d3grjbqvi5vvydbffxwka9w3k3qiia50m7fnph"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; buildInputs = [ SDL2 diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 9efe47cc250..ddbe276de3c 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -24,7 +24,6 @@ in stdenv.mkDerivation rec { sha256 = "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq"; }; - enableParallelBuilding = true; nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ]; buildInputs = [ diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 2b9cb5e6d27..c210b3ddeec 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -41,8 +41,6 @@ let --add-flags "-L $COREDIR/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@" ''; - enableParallelBuilding = true; - passthru = { inherit (a) core; libretroCore = "/lib/retroarch/cores"; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index c672a9bf6bb..4b0d698905f 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -44,8 +44,6 @@ mkDerivation { ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; - enableParallelBuilding = true; - meta = with lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index 86177892f43..0e098d3a704 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { pango lzma nasm llvm glibmm ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Open source Flash Player implementation"; homepage = "https://lightspark.github.io/"; diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 9fbeda708e0..f4e01f75d52 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h"; }; - enableParallelBuilding = true; - buildInputs = with llvmPackages; [ llvm clang-unwrapped kernel elfutils libelf bcc diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index f8a1b836a6c..766216f07d9 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig gettext ]; buildInputs = [ dbus dbus-glib libgaminggear libgudev lua ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DUDEVDIR=\${out}/lib/udev/rules.d" "-DCMAKE_MODULE_PATH=${libgaminggear.dev}/lib/cmake" diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index 8b1d11ab36b..c32f56e7c7d 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { cp -r ${minizip-src}/* $sourceRoot/extern/minizip ''; - enableParallelBuilding = true; - buildInputs = [ openssl python3 diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 7ad27e78d3a..1b5b63cfae1 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -36,7 +36,6 @@ let ++ lib.optional useClang [ llvmPackages.lld ]; separateDebugInfo = true; - enableParallelBuilding = true; dontFixCmake = true; cmakeFlags = @@ -66,7 +65,7 @@ let # fix up the use of the very weird and custom 'fdb_install' command by just # replacing it with cmake's ordinary version. postPatch = '' - for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do + for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do substituteInPlace $x --replace 'fdb_install' 'install' done ''; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index 999016e4bd9..f77307fd53e 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" "lib" ]; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ninja ]; buildInputs = [ openssl libuv zlib ]; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 4d5c24c7304..bf7f7b43960 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -36,8 +36,6 @@ let "-DASM_OPTIMIZATIONS=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://www.arangodb.com"; description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 8c71514dfba..6454aa4897e 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation { propagatedBuildInputs = [ curl openssl zlib ]; buildInputs = [ libiconv ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput bin/mariadb_config "$dev" ''; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index cbfae1d5e6e..90c11084a7c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -100,8 +100,6 @@ common = rec { # attributes common to both builds rm -r $out/share/aclocal ''; - enableParallelBuilding = true; - passthru.mysqlVersion = "5.7"; passthru.tests = { diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index ca188ee951d..afbaea648f0 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "https://tmate.io/"; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index ef830710c1c..d5e4d607f72 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake xxd ]; buildInputs = [ openssl libwebsockets json_c libuv zlib ]; - enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index f4c3270bf3d..9c857f95a45 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -35,8 +35,6 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" ]; # disable dvbscan, as having it enabled causes a network download which @@ -73,9 +71,9 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "TV streaming server"; longDescription = '' - Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android + Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources. - Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.''; + Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.''; homepage = "https://tvheadend.org"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index 257d94f4a73..1547d71791d 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { cp $louiz_catch/single_include/catch.hpp tests/ ''; - enableParallelBuilding = true; doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 657bbc8d664..89d4aac340c 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -159,8 +159,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DWITH_SYSTEMD=ON" "-DZM_LOGDIR=/var/log/${dirName}" diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 0811d43eb6a..a39a2fc740b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -196,8 +196,6 @@ let tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks} ''; - enableParallelBuilding = true; - meta = with lib; { description = "Smart and user-friendly command line shell"; homepage = "http://fishshell.com/"; diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 807282fae59..3fbb0930cab 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; - enableParallelBuilding = true; - postPatch = '' patchShebangs . find . -type f -name Makefile -exec sed -i 's|^\(SHELL:=\)/bin/bash$|\1${stdenv.shell}|g' {} \; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 054e061c4ac..cf5f1982454 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { --replace "LD_PRELOAD=libgefaker" "LD_PRELOAD=$out/lib/libgefaker" ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "http://www.virtualgl.org/"; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 0bb291d797b..7cec67d0078 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -93,8 +93,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; - enableParallelBuilding = true; - meta = { homepage = "https://tigervnc.org/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index da26639fcb5..4f6137a4211 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; - enableParallelBuilding = true; - # we need unar to for multi-archive extraction postFixup = stdenv.lib.optionalString withGog '' wrapProgram $out/bin/innoextract \ diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index 6ee7f6e6a21..782377d351d 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - enableParallelBuilding = true; - prePatch = '' substituteInPlace cmake/HTTRAQTFindHttrack.cmake \ --replace /usr/include/httrack/ ${httrack}/include/httrack/ diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 13e1d836938..e897336392f 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { cp $src/src/zopfli/*.h $dev/include/ ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Very good, but slow, deflate or zlib compression"; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 1a43d792ad3..7a9809bdfc2 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -195,8 +195,6 @@ in rec { test -f $out/bin/ceph-volume ''; - enableParallelBuilding = true; - outputs = [ "out" "lib" "dev" "doc" "man" ]; doCheck = false; # uses pip to install things from the internet diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 8f7f4f1a313..ef95bad0c24 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -48,8 +48,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost cryptopp curl fuse openssl ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" "-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 24aa52e366f..57affc2603e 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { "-DINSTALL_LIBENCFS=ON" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "An encrypted filesystem in user-space via FUSE"; homepage = "https://vgough.github.io/encfs"; diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index c8efa4d61ab..a83f6ba515c 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ fuse ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Transparent encryption filesystem"; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index 67e49936f5b..578ee093c05 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -47,7 +47,6 @@ in stdenv.mkDerivation rec { "-DUSE_SSE=ON" "-DUSE_SSE42=ON" ]; - enableParallelBuilding = true; meta = with stdenv.lib; { description = "Open source, physically-based global illumination rendering engine"; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 9ce87b4cb67..5889df1c4d9 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -61,8 +61,6 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - # Same as vulkan-validation-layers libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; dontPatchELF = true; diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index ff620ef8287..2b0cf1c7a05 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; - enableParallelBuilding = true; libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 5b1ed99bb7e..d96cc266237 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { --replace ${fcitx} $out ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { isFcitxEngine = true; homepage = "https://github.com/fcitx/fcitx-rime"; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 988849fbbbf..a923dbf651f 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools qtsvg ]; buildInputs = [ qtbase ]; - enableParallelBuilding = true; - meta = with lib; { description = "Powerful yet simple to use screenshot software"; homepage = "https://github.com/flameshot-org/flameshot"; diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index 8d585324d87..5d753d2d68c 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ icu openssl ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://octobanana.com/software/fltrdr"; description = "A TUI text reader for the terminal"; diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index bd99fa7024c..252572dee65 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -39,8 +39,6 @@ mkDerivation { install -m644 ../OSX/README.txt $out/share/doc/heimdall/README.osx ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 1a779616ab8..845c0fec921 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -15,8 +15,6 @@ in mkDerivation rec { sha256 = "0jhggb4xksb0k0mj752n6pz0xmccnbzlp984xydqbz3hkigra1si"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook ]; # refer to kpmcore for the use of eject diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index 3a125fcdbf7..e1bdb6b811f 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "https://tmate.io/"; diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 94a181eb5ae..b279f681a2b 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - enableParallelBuilding = true; - doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index d3fb37705bd..70296f5a425 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - doCheck = false; postInstall = '' diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index b83c49029b3..66b16ecc046 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation rec { "-DUSE_NLS=${if withNLS then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - meta = with lib; { description = "Command-line package management tools used on Debian-based systems"; homepage = "https://salsa.debian.org/apt-team/apt"; diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index 2a1ebada002..f95a37ae723 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - meta = packagekit.meta // { description = "System to facilitate installing and updating packages - Qt"; }; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index 7474cb0715d..bc57849dcd5 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ swig wireshark check rsync libpcap gawk libedit pcre ]; - enableParallelBuilding = true; - meta = { description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files"; homepage = "http://www.haka-security.org/"; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 37da2022520..7ec902bcb99 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { bash-completion curl openssl libxml2 libxslt ]; - enableParallelBuilding = true; - installTargets = [ "install" "install-doc" ]; postInstall = '' diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix index 216186daa5b..befd6108919 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/tools/security/nmap/qt.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtscript qtwebengine ]; - enableParallelBuilding = true; - postPatch = '' substituteInPlace src/platform/digmanager.cpp \ --replace '"dig"' '"${dnsutils}/bin/dig"' diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 2a101bba886..d1a7f742974 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/puppetlabs/facter"; description = "A system inventory tool"; |