From d2758ce017c569d0146a5aa5e1ebf4dacb5292ee Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 15 Feb 2014 10:23:56 +0100
Subject: freecad: Fix build with current cmake.

---
 pkgs/applications/graphics/freecad/cmake.patch | 12 ++++++++++++
 pkgs/applications/graphics/freecad/default.nix |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/graphics/freecad/cmake.patch

(limited to 'pkgs/applications/graphics/freecad')

diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch
new file mode 100644
index 00000000000..e54e16da977
--- /dev/null
+++ b/pkgs/applications/graphics/freecad/cmake.patch
@@ -0,0 +1,12 @@
+diff -ru freecad-0.13.1830.orig/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt
+--- freecad-0.13.1830.orig/CMakeLists.txt       2013-02-02 18:09:17.000000000 +0100
++++ freecad-0.13.1830/CMakeLists.txt    2014-02-15 10:16:00.939725500 +0100
+@@ -321,7 +321,7 @@
+         foreach(it ${moc_files})
+             get_filename_component(it ${it} ABSOLUTE)
+             QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
+-            QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
++            QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "")
+             set(${outfiles} ${${outfiles}} ${outfile})
+             add_file_dependencies(${it} ${outfile})
+         endforeach(it)
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 37265c954e8..770a7ee8212 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
   '';
 
-  patches = [ ./pythonpath.patch ];
+  patches = [ ./pythonpath.patch ./cmake.patch ];
 
   meta = {
     homepage = http://free-cad.sourceforge.net/;
-- 
cgit 1.4.1