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