From 98bbb0e3e6cbf7a4fb3fad7f44d7af5812bda0d2 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Dec 2017 05:42:13 +0000 Subject: altcoins.memorycoin: disable parallel building --- pkgs/applications/altcoins/memorycoin.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index 24b891d60eb2..a14276d4fa2d 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec{ then "install -D bitcoin-qt $out/bin/memorycoin-qt" else "install -D bitcoind $out/bin/memorycoind"; + # `make build/version.o`: + # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop. + enableParallelBuilding = false; + meta = { description = "Peer-to-peer, CPU-based electronic cash system"; longDescription= '' -- cgit 1.4.1 From c875aecdbe695cd09b1bda54803852f704307baa Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Dec 2017 05:43:38 +0000 Subject: altcoins.primecoin: disable parallel building --- pkgs/applications/altcoins/primecoin.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index b1e3dc2dd93d..f79d54d0ce26 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec{ then "install -D bitcoin-qt $out/bin/primecoin-qt" else "install -D bitcoind $out/bin/primecoind"; + # `make build/version.o`: + # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop. + enableParallelBuilding = false; + meta = { description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers"; longDescription= '' -- cgit 1.4.1 From 9b537c48d399d60dddd6bf07e7cf517ebc2020b8 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 7 Dec 2017 08:51:18 +0000 Subject: awesomebump: fix parallel building --- pkgs/applications/graphics/awesomebump/default.nix | 5 +++++ .../graphics/awesomebump/qtnproperty-parallel-building.patch | 9 +++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index f190b421b056..5e9221cf92b0 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -15,6 +15,7 @@ let name = "qtnproperty"; inherit src; sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; + patches = [ ./qtnproperty-parallel-building.patch ]; buildInputs = [ qtscript qtbase qtdeclarative ]; nativeBuildInputs = [ qmake flex bison ]; postInstall = '' @@ -46,6 +47,10 @@ in stdenv.mkDerivation rec { --run "cd $d" ''; + passthru = { + inherit qtnproperty; + }; + meta = { homepage = https://github.com/kmkolasinski/AwesomeBump; description = "A program to generate normal, height, specular or ambient occlusion textures from a single image"; diff --git a/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch new file mode 100644 index 000000000000..b3f8e68dd1ad --- /dev/null +++ b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch @@ -0,0 +1,9 @@ +--- a/PEG/Flex.pri ++++ b/PEG/Flex.pri +@@ -1,5 +1,6 @@ + flex.name = Flex ${QMAKE_FILE_IN} + flex.input = FLEX_SOURCES ++flex.depends = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp + flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp + + win32:flex.commands = win_flex --wincompat -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} -- cgit 1.4.1 From c12fe7416e1f964b945bcdc32fef4c86522a0f05 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 5 Dec 2017 15:34:39 +0000 Subject: golden-cheetah: disable parallel building qmake does not support translations in resources. --- pkgs/applications/misc/golden-cheetah/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 358d9dff44a6..efd3bfe73dd9 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + + # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm' + enableParallelBuilding = false; + meta = { description = "Performance software for cyclists, runners and triathletes"; platforms = stdenv.lib.platforms.linux; -- cgit 1.4.1 From 7b6b099811cbefa63eb9a5021b8269db8583cb71 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 5 Dec 2017 15:29:29 +0000 Subject: ostinato: disable parallel building --- pkgs/applications/networking/ostinato/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 41e64d7b721f..f2b7a4a4e999 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation rec { EOF ''; + # `cd common; qmake ostproto.pro; make pdmlreader.o`: + # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "A packet traffic generator and analyzer"; homepage = http://ostinato.org; -- cgit 1.4.1 From 22116e51fcc04767bc3be9d78fd43de1556ff6cb Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 5 Dec 2017 14:59:56 +0000 Subject: guitone: fix parallel building --- pkgs/applications/version-management/guitone/default.nix | 3 +++ .../version-management/guitone/parallel-building.patch | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 pkgs/applications/version-management/guitone/parallel-building.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index bfaa62ebb66d..ded0d5e39863 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { branch = "net.venge.monotone.guitone"; }; + patches = [ ./parallel-building.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ qt4 qmake4Hook graphviz ]; @@ -24,6 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 based GUI for monotone"; homepage = http://guitone.thomaskeller.biz; + downloadPage = https://code.monotone.ca/p/guitone/; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/version-management/guitone/parallel-building.patch b/pkgs/applications/version-management/guitone/parallel-building.patch new file mode 100644 index 000000000000..f0e924cbfb81 --- /dev/null +++ b/pkgs/applications/version-management/guitone/parallel-building.patch @@ -0,0 +1,7 @@ +Without this `make tmp/AttributesView.o` fails with +src/view/dialogs/AddEditAttribute.h:22:35: fatal error: ui_add_edit_attribute.h: No such file or directory +--- a/guitone.pro ++++ b/guitone.pro +@@ -215 +215,2 @@ help.commands = @echo Available targets: $${QMAKE_EXTRA_TARGETS} + QMAKE_EXTRA_TARGETS += help ++CONFIG += depend_includepath -- cgit 1.4.1 From 00fd31c1694a85160aceaed646fc2c75f31a7bc5 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 5 Dec 2017 11:26:04 +0000 Subject: qgis: disable parallel building --- pkgs/applications/gis/qgis/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index f64845f6e43a..e33b2dba3fa7 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; + # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`: # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory - #enableParallelBuilding = true; + enableParallelBuilding = false; # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. -- cgit 1.4.1 From 57d27fb420edee50030d7934f31b0149ba477db4 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 5 Dec 2017 15:26:32 +0000 Subject: ricochet: disable parallel building qmake does not support translations in resources. --- pkgs/applications/networking/instant-messengers/ricochet/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 050eb7765906..c99130f28a39 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation rec { cp icons/ricochet.png $out/share/pixmaps/ricochet.png ''; + # RCC: Error in 'translation/embedded.qrc': Cannot find file 'ricochet_en.qm' + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "Anonymous peer-to-peer instant messaging"; homepage = https://ricochet.im; -- cgit 1.4.1 From 812e0bced198a3d4d7d8b01ca6c2ae6490f7bb4f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 3 Dec 2017 11:27:45 +0000 Subject: shogun: fix parallel building --- pkgs/applications/science/machine-learning/shogun/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 9d736694cbdc..ae272284bcdc 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig +{ stdenv, lib, fetchFromGitHub, fetchpatch, ccache, cmake, ctags, swig # data, compression , bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy # maths @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = fetchpatch { + name = "Fix-meta-example-parser-bug-in-parallel-builds.patch"; + url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch"; + sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n"; + }; + CCACHE_DIR=".ccache"; buildInputs = with lib; [ -- cgit 1.4.1 From 9f8ec7e4d327f96d7a6de982bcfd983e3cd873f1 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 5 Dec 2017 11:28:04 +0000 Subject: stp: disable parallel building --- pkgs/applications/science/logic/stp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 8c0b82cc549c..367449f44f38 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { ) ''; + # `make -f lib/Interface/CMakeFiles/cppinterface.dir/build.make lib/Interface/CMakeFiles/cppinterface.dir/cpp_interface.cpp.o`: + # include/stp/AST/UsefulDefs.h:41:29: fatal error: stp/AST/ASTKind.h: No such file or directory + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "Simple Theorem Prover"; maintainers = with maintainers; [ mornfall ]; -- cgit 1.4.1 From 75d70c837251c00ca338a22e66aa29f1d13fc99c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 3 Dec 2017 07:51:16 +0000 Subject: dino: build with Ninja Upstream recommends Ninja and has a cmake script that does not support GNU Make: https://github.com/dino/dino/issues/230 --- pkgs/applications/networking/instant-messengers/dino/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index ca7f717810fa..bfe4e9708e3d 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, vala, cmake, wrapGAppsHook, pkgconfig, gettext +, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ vala cmake + ninja pkgconfig wrapGAppsHook ]; -- cgit 1.4.1 From a22d22443445ddcdc3eaad66eda500fd31185546 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 8 Dec 2017 12:35:22 +0000 Subject: awesomebump: disable parallel building https://hydra.nixos.org/build/65585975 --- pkgs/applications/graphics/awesomebump/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index 5e9221cf92b0..f7a813f36061 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -47,9 +47,9 @@ in stdenv.mkDerivation rec { --run "cd $d" ''; - passthru = { - inherit qtnproperty; - }; + # $ cd Sources; qmake; make ../workdir/linux-g++-dgb-gl4/obj/glwidget.o + # fatal error: properties/ImageProperties.peg.h: No such file or directory + enableParallelBuilding = false; meta = { homepage = https://github.com/kmkolasinski/AwesomeBump; -- cgit 1.4.1