about summary refs log tree commit diff
path: root/pkgs/applications/graphics/awesomebump
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-12-07 08:51:18 +0000
committerOrivej Desh <orivej@gmx.fr>2017-12-07 08:52:42 +0000
commit9b537c48d399d60dddd6bf07e7cf517ebc2020b8 (patch)
treeece4e133a57442ed7b70a315f159426397a751b2 /pkgs/applications/graphics/awesomebump
parentc875aecdbe695cd09b1bda54803852f704307baa (diff)
awesomebump: fix parallel building
Diffstat (limited to 'pkgs/applications/graphics/awesomebump')
-rw-r--r--pkgs/applications/graphics/awesomebump/default.nix5
-rw-r--r--pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch9
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index f190b421b0566..5e9221cf92b08 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 0000000000000..b3f8e68dd1adf
--- /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}