Merge pull request #130638 from siraben/par-treewide

treewide: remove unnecessary enableParallelBuilding when using cmake, meson, qmake
This commit is contained in:
Ben Siraphob 2021-07-20 12:10:21 +07:00 committed by GitHub
commit e8599765f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 0 additions and 76 deletions

View file

@ -47,8 +47,6 @@ in mkDerivation rec {
substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" ""; substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
''; '';
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "Analyse and compare audio files in time and frequency"; description = "Analyse and compare audio files in time and frequency";
longDescription = '' longDescription = ''

View file

@ -38,8 +38,6 @@ mkDerivation rec {
PREFIXSHORTCUT=$out" PREFIXSHORTCUT=$out"
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "Free Musical Instrument Tuner"; description = "Free Musical Instrument Tuner";
longDescription = '' longDescription = ''

View file

@ -19,8 +19,6 @@ mkDerivation rec {
installFlags = [ "INSTALL_ROOT=$(out)" ]; installFlags = [ "INSTALL_ROOT=$(out)" ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "Graphical open-source sequencer"; description = "Graphical open-source sequencer";
homepage = "https://www.iannix.org/"; homepage = "https://www.iannix.org/";

View file

@ -110,8 +110,6 @@ mkDerivation rec {
wavpack wavpack
]; ];
enableParallelBuilding = true;
qtWrapperArgs = [ qtWrapperArgs = [
"--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
]; ];

View file

@ -45,8 +45,6 @@ stdenv.mkDerivation rec {
tagparser tagparser
]; ];
enableParallelBuilding = true;
meta = with pkgs.lib; { meta = with pkgs.lib; {
homepage = "https://github.com/Martchus/tageditor"; homepage = "https://github.com/Martchus/tageditor";
description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska";

View file

@ -12,8 +12,6 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake qttools ]; nativeBuildInputs = [ pkg-config qmake qttools ];
buildInputs = [ hunspell qtbase qtmultimedia ]; buildInputs = [ hunspell qtbase qtmultimedia ];
enableParallelBuilding = true;
qmakeFlags = [ "PREFIX=/" ]; qmakeFlags = [ "PREFIX=/" ];
installFlags = [ "INSTALL_ROOT=$(out)" ]; installFlags = [ "INSTALL_ROOT=$(out)" ];

View file

@ -19,8 +19,6 @@ mkDerivation rec {
"METAINFODIR=${placeholder "out"}/share/metainfo" "METAINFODIR=${placeholder "out"}/share/metainfo"
]; ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "TeX and LaTeX editor"; description = "TeX and LaTeX editor";
longDescription='' longDescription=''

View file

@ -15,8 +15,6 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake ]; nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [ python qtbase qttools ]; buildInputs = [ python qtbase qttools ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "Free, easy to use and flexible tile map editor"; description = "Free, easy to use and flexible tile map editor";
homepage = "https://www.mapeditor.org/"; homepage = "https://www.mapeditor.org/";

View file

@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
buildInputs = [ qtbase poppler ]; buildInputs = [ qtbase poppler ];
enableParallelBuilding = true;
qmakeFlags = [ qmakeFlags = [
"DESKTOP_INSTALL_DIR=${placeholder "out"}/share/applications" "DESKTOP_INSTALL_DIR=${placeholder "out"}/share/applications"

View file

@ -18,8 +18,6 @@ mkDerivation rec {
buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ]; buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ];
propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ]; propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ];
enableParallelBuilding = true;
meta = { meta = {
description = "A comic reader for cross-platform reading and managing your digital comic collection"; description = "A comic reader for cross-platform reading and managing your digital comic collection";
homepage = "http://www.yacreader.com"; homepage = "http://www.yacreader.com";

View file

@ -14,8 +14,6 @@ mkDerivation rec {
buildInputs = [ boost qtbase qtwebkit poppler hunspell ]; buildInputs = [ boost qtbase qtwebkit poppler hunspell ];
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
postPatch = '' postPatch = ''

View file

@ -13,7 +13,6 @@ mkDerivation {
buildInputs = [ qtbase vcg glew ]; buildInputs = [ qtbase vcg glew ];
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
qmakeFlags = [ "openBrf.pro" ]; qmakeFlags = [ "openBrf.pro" ];

View file

@ -39,8 +39,6 @@ mkDerivation rec {
variables.pri variables.pri
''; '';
enableParallelBuilding = true;
postInstall = '' postInstall = ''
ln -sf $out/lib/*/libqlcplus* $out/lib ln -sf $out/lib/*/libqlcplus* $out/lib
''; '';

View file

@ -24,8 +24,6 @@ mkDerivation rec {
nativeBuildInputs = [ qmake qttools ]; nativeBuildInputs = [ qmake qttools ];
enableParallelBuilding = true;
patches = [ patches = [
# Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded. # Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded.
# TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available. # TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available.

View file

@ -64,8 +64,6 @@ let
mv lib $out/ mv lib $out/
''; '';
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;
description = "QtLocation plugin for Google maps tile API"; description = "QtLocation plugin for Google maps tile API";

View file

@ -11,7 +11,6 @@ mkDerivation rec {
sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll"; sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll";
}; };
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
qmakeFlags = [ "CONFIG-=app_bundle" ]; qmakeFlags = [ "CONFIG-=app_bundle" ];

View file

@ -15,8 +15,6 @@ mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
enableParallelBuilding = true;
buildInputs = [ qtbase qtquickcontrols ]; buildInputs = [ qtbase qtquickcontrols ];
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];

View file

@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
buildInputs = [ libcommuni qtbase ]; buildInputs = [ libcommuni qtbase ];
enableParallelBuilding = true;
dontWrapQtApps = true; dontWrapQtApps = true;
preConfigure = '' preConfigure = ''

View file

@ -24,8 +24,6 @@ mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ]; makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ];
enableParallelBuilding = true;
installTargets = [ "install_client" "install_man" ]; installTargets = [ "install_client" "install_man" ];
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ];

View file

@ -68,8 +68,6 @@ gnuradio3_8.pkgs.mkDerivation rec {
gnuradio3_8.qt.wrapQtAppsHook gnuradio3_8.qt.wrapQtAppsHook
]; ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "SDR transceiver application for analog and digital modes"; description = "SDR transceiver application for analog and digital modes";
homepage = "http://qradiolink.org/"; homepage = "http://qradiolink.org/";

View file

@ -10,8 +10,6 @@ mkDerivation rec {
sha256 = "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi"; sha256 = "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi";
}; };
enableParallelBuilding = true;
nativeBuildInputs = [ nativeBuildInputs = [
qmake qmake
pkg-config pkg-config

View file

@ -9,8 +9,6 @@ mkDerivation rec {
sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav"; sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav";
}; };
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
meta = with lib; { meta = with lib; {

View file

@ -30,8 +30,6 @@ mkDerivation rec {
--replace /usr $out --replace /usr $out
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "Ground station software for autonomous vehicles"; description = "Ground station software for autonomous vehicles";
longDescription = '' longDescription = ''

View file

@ -17,7 +17,6 @@ mkDerivation rec {
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland
]; ];
enableParallelBuilding = true;
buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
nativeBuildInputs = [ pkg-config qmake qttools ]; nativeBuildInputs = [ pkg-config qmake qttools ];

View file

@ -29,8 +29,6 @@ mkDerivation rec {
ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "Terminal emulator which mimics the old cathode display"; description = "Terminal emulator which mimics the old cathode display";
longDescription = '' longDescription = ''

View file

@ -34,7 +34,6 @@ mkDerivation rec {
sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk="; sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk=";
}; };
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config qmake ]; nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [ buildInputs = [
SDL2 SDL2

View file

@ -50,7 +50,6 @@ in stdenv.mkDerivation rec {
] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON"; ] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON";
doCheck = true; doCheck = true;
enableParallelBuilding = true;
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
outputs = [ "bin" "dev" "out" "static" ]; outputs = [ "bin" "dev" "out" "static" ];

View file

@ -9,7 +9,6 @@ stdenv.mkDerivation {
rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62"; rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62";
}; };
enableParallelBuilding = true;
dontWrapQtApps = true; dontWrapQtApps = true;
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];

View file

@ -30,8 +30,6 @@ stdenv.mkDerivation {
installFlags = [ "INSTALL_ROOT=$(out)" ]; installFlags = [ "INSTALL_ROOT=$(out)" ];
enableParallelBuilding = true;
dontWrapQtApps = true; dontWrapQtApps = true;
meta = { meta = {

View file

@ -34,7 +34,6 @@ in stdenv.mkDerivation rec {
ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
''; '';
enableParallelBuilding = true;
dontWrapQtApps = true; dontWrapQtApps = true;
postPatch = '' postPatch = ''

View file

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
setOutputFlags = false; setOutputFlags = false;
enableParallelBuilding = true;
NIX_QT_SUBMODULE = true; NIX_QT_SUBMODULE = true;
dontWrapQtApps = true; dontWrapQtApps = true;

View file

@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qtscript ]; buildInputs = [ qtbase qtscript ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "A tool that helps simplify the build process for developing projects across multiple platforms"; description = "A tool that helps simplify the build process for developing projects across multiple platforms";
homepage = "https://wiki.qt.io/Qbs"; homepage = "https://wiki.qt.io/Qbs";

View file

@ -16,7 +16,6 @@ mkDerivation rec {
sourceRoot = "source/MiniZincIDE"; sourceRoot = "source/MiniZincIDE";
enableParallelBuilding = true;
dontWrapQtApps = true; dontWrapQtApps = true;
postInstall = '' postInstall = ''

View file

@ -75,8 +75,6 @@ in stdenv.mkDerivation rec {
__impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; __impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
enableParallelBuilding = true;
dontWrapQtApps = true; dontWrapQtApps = true;
installPhase = '' installPhase = ''

View file

@ -45,8 +45,6 @@ mkDerivation rec {
doCheck = true; doCheck = true;
enableParallelBuilding = true;
buildFlags = optional withDocumentation "docs"; buildFlags = optional withDocumentation "docs";
installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";

View file

@ -61,8 +61,6 @@ mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL";
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
homepage = "https://www.pokerth.net"; homepage = "https://www.pokerth.net";
description = "Poker game ${target}"; description = "Poker game ${target}";

View file

@ -43,6 +43,4 @@ mkDerivation {
''; '';
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtmultimedia qttranslations ]; buildInputs = [ qtbase qtmultimedia qttranslations ];
enableParallelBuilding = true;
} }

View file

@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "A free 2D physics sandbox game"; description = "A free 2D physics sandbox game";
homepage = "http://powdertoy.co.uk/"; homepage = "http://powdertoy.co.uk/";

View file

@ -12,8 +12,6 @@ mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtdeclarative ]; buildInputs = [ qtbase qtdeclarative ];

View file

@ -16,7 +16,6 @@ let
version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version; version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version;
nativeBuildInputs = [ cmake addOpenGLRunpath ]; nativeBuildInputs = [ cmake addOpenGLRunpath ];
buildInputs = [ cudatoolkit ]; buildInputs = [ cudatoolkit ];
enableParallelBuilding = true;
postFixup = '' postFixup = ''
for exe in $out/bin/*; do for exe in $out/bin/*; do
addOpenGLRunpath $exe addOpenGLRunpath $exe

View file

@ -35,8 +35,6 @@ stdenv.mkDerivation {
done done
''; '';
enableParallelBuilding = true;
# Inspired by install/linux-install/nifskope.spec.in. # Inspired by install/linux-install/nifskope.spec.in.
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

View file

@ -20,8 +20,6 @@ mkDerivation rec {
"PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
]; ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "Qt5 Configuration Tool"; description = "Qt5 Configuration Tool";
homepage = "https://www.opendesktop.org/content/show.php?content=168066"; homepage = "https://www.opendesktop.org/content/show.php?content=168066";

View file

@ -15,8 +15,6 @@ mkDerivation rec {
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
enableParallelBuilding = true;
postPatch = '' postPatch = ''
for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do
substituteInPlace $f --replace /etc $out/etc --replace /usr $out substituteInPlace $f --replace /etc $out/etc --replace /usr $out

View file

@ -20,7 +20,6 @@ mkDerivation rec {
buildInputs = [ boost ]; buildInputs = [ boost ];
qmakeFlags = [ "VERSION=${version}" ]; qmakeFlags = [ "VERSION=${version}" ];
enableParallelBuilding = true;
postInstall = lib.optionalString stdenv.isDarwin '' postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications mkdir -p $out/Applications