mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 22:21:26 +00:00
Merge pull request #130638 from siraben/par-treewide
treewide: remove unnecessary enableParallelBuilding when using cmake, meson, qmake
This commit is contained in:
Ben Siraphob
GitHub
commit
e8599765f5
@ -47,8 +47,6 @@ in mkDerivation rec {
|
||||
substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Analyse and compare audio files in time and frequency";
|
||||
longDescription = ''
|
||||
|
||||
@ -38,8 +38,6 @@ mkDerivation rec {
|
||||
PREFIXSHORTCUT=$out"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Free Musical Instrument Tuner";
|
||||
longDescription = ''
|
||||
|
||||
@ -19,8 +19,6 @@ mkDerivation rec {
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical open-source sequencer";
|
||||
homepage = "https://www.iannix.org/";
|
||||
|
||||
@ -110,8 +110,6 @@ mkDerivation rec {
|
||||
wavpack
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
|
||||
];
|
||||
|
||||
@ -45,8 +45,6 @@ stdenv.mkDerivation rec {
|
||||
tagparser
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
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";
|
||||
|
||||
@ -12,8 +12,6 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config qmake qttools ];
|
||||
buildInputs = [ hunspell qtbase qtmultimedia ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
qmakeFlags = [ "PREFIX=/" ];
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
|
||||
|
||||
@ -19,8 +19,6 @@ mkDerivation rec {
|
||||
"METAINFODIR=${placeholder "out"}/share/metainfo"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "TeX and LaTeX editor";
|
||||
longDescription=''
|
||||
|
||||
@ -15,8 +15,6 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
buildInputs = [ python qtbase qttools ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free, easy to use and flexible tile map editor";
|
||||
homepage = "https://www.mapeditor.org/";
|
||||
|
||||
@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
|
||||
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
|
||||
buildInputs = [ qtbase poppler ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
qmakeFlags = [
|
||||
"DESKTOP_INSTALL_DIR=${placeholder "out"}/share/applications"
|
||||
|
||||
@ -18,8 +18,6 @@ mkDerivation rec {
|
||||
buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ];
|
||||
propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A comic reader for cross-platform reading and managing your digital comic collection";
|
||||
homepage = "http://www.yacreader.com";
|
||||
|
||||
@ -14,8 +14,6 @@ mkDerivation rec {
|
||||
|
||||
buildInputs = [ boost qtbase qtwebkit poppler hunspell ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,6 @@ mkDerivation {
|
||||
|
||||
buildInputs = [ qtbase vcg glew ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
qmakeFlags = [ "openBrf.pro" ];
|
||||
|
||||
@ -39,8 +39,6 @@ mkDerivation rec {
|
||||
variables.pri
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
ln -sf $out/lib/*/libqlcplus* $out/lib
|
||||
'';
|
||||
|
||||
@ -24,8 +24,6 @@ mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [
|
||||
# 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.
|
||||
|
||||
@ -64,8 +64,6 @@ let
|
||||
mv lib $out/
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "QtLocation plugin for Google maps tile API";
|
||||
|
||||
@ -11,7 +11,6 @@ mkDerivation rec {
|
||||
sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase ];
|
||||
qmakeFlags = [ "CONFIG-=app_bundle" ];
|
||||
|
||||
@ -15,8 +15,6 @@ mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ qtbase qtquickcontrols ];
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
|
||||
@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ libcommuni qtbase ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -24,8 +24,6 @@ mkDerivation rec {
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installTargets = [ "install_client" "install_man" ];
|
||||
|
||||
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ];
|
||||
|
||||
@ -68,8 +68,6 @@ gnuradio3_8.pkgs.mkDerivation rec {
|
||||
gnuradio3_8.qt.wrapQtAppsHook
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "SDR transceiver application for analog and digital modes";
|
||||
homepage = "http://qradiolink.org/";
|
||||
|
||||
@ -10,8 +10,6 @@ mkDerivation rec {
|
||||
sha256 = "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
pkg-config
|
||||
|
||||
@ -9,8 +9,6 @@ mkDerivation rec {
|
||||
sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -30,8 +30,6 @@ mkDerivation rec {
|
||||
--replace /usr $out
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Ground station software for autonomous vehicles";
|
||||
longDescription = ''
|
||||
|
||||
@ -17,7 +17,6 @@ mkDerivation rec {
|
||||
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
|
||||
nativeBuildInputs = [ pkg-config qmake qttools ];
|
||||
|
||||
|
||||
@ -29,8 +29,6 @@ mkDerivation rec {
|
||||
ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Terminal emulator which mimics the old cathode display";
|
||||
longDescription = ''
|
||||
|
||||
@ -34,7 +34,6 @@ mkDerivation rec {
|
||||
sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
|
||||
@ -50,7 +50,6 @@ in stdenv.mkDerivation rec {
|
||||
] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON";
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
hardeningDisable = [ "fortify" ];
|
||||
outputs = [ "bin" "dev" "out" "static" ];
|
||||
|
||||
|
||||
@ -9,7 +9,6 @@ stdenv.mkDerivation {
|
||||
rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
dontWrapQtApps = true;
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
|
||||
@ -30,8 +30,6 @@ stdenv.mkDerivation {
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@ -34,7 +34,6 @@ in stdenv.mkDerivation rec {
|
||||
ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
setOutputFlags = false;
|
||||
enableParallelBuilding = true;
|
||||
NIX_QT_SUBMODULE = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
||||
@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ qtbase qtscript ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool that helps simplify the build process for developing projects across multiple platforms";
|
||||
homepage = "https://wiki.qt.io/Qbs";
|
||||
|
||||
@ -16,7 +16,6 @@ mkDerivation rec {
|
||||
|
||||
sourceRoot = "source/MiniZincIDE";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -75,8 +75,6 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
__impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -45,8 +45,6 @@ mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildFlags = optional withDocumentation "docs";
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
|
||||
|
||||
@ -61,8 +61,6 @@ mkDerivation rec {
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.pokerth.net";
|
||||
description = "Poker game ${target}";
|
||||
|
||||
@ -43,6 +43,4 @@ mkDerivation {
|
||||
'';
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase qtmultimedia qttranslations ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
}
|
||||
|
||||
@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free 2D physics sandbox game";
|
||||
homepage = "http://powdertoy.co.uk/";
|
||||
|
||||
@ -12,8 +12,6 @@ mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
buildInputs = [ qtbase qtdeclarative ];
|
||||
|
||||
@ -16,7 +16,6 @@ let
|
||||
version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version;
|
||||
nativeBuildInputs = [ cmake addOpenGLRunpath ];
|
||||
buildInputs = [ cudatoolkit ];
|
||||
enableParallelBuilding = true;
|
||||
postFixup = ''
|
||||
for exe in $out/bin/*; do
|
||||
addOpenGLRunpath $exe
|
||||
|
||||
@ -35,8 +35,6 @@ stdenv.mkDerivation {
|
||||
done
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Inspired by install/linux-install/nifskope.spec.in.
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -20,8 +20,6 @@ mkDerivation rec {
|
||||
"PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt5 Configuration Tool";
|
||||
homepage = "https://www.opendesktop.org/content/show.php?content=168066";
|
||||
|
||||
@ -15,8 +15,6 @@ mkDerivation rec {
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do
|
||||
substituteInPlace $f --replace /etc $out/etc --replace /usr $out
|
||||
|
||||
@ -20,7 +20,6 @@ mkDerivation rec {
|
||||
buildInputs = [ boost ];
|
||||
|
||||
qmakeFlags = [ "VERSION=${version}" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
|
||||
Loading…
Reference in New Issue
Block a user