Merge pull request #797 from qknight/smokegen-patch-fix

fixed patch rejection and added RPATH magic

3 files changed, 15 insertions, 1 deletions

diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch
new file mode 100644
index 000000000000..33ec3df6452d
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch
@@ -0,0 +1,14 @@
+--- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/CMakeLists.txt      2013-07-31 19:15:17.000000000 +0000
+@@ -36,6 +36,10 @@
+ set (CMAKE_SKIP_BUILD_RPATH FALSE)
+ set (CMAKE_SKIP_RPATH FALSE)
+
++# add the automatically determined parts of the RPATH
++# which point to directories outside the build tree to the install RPATH
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+
+ add_executable(smokegen ${generator_SRC})
+
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch
index 53257e836e04..53257e836e04 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
index 8b5da2a641dd..0a3f2a85efaf 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
@@ -4,7 +4,7 @@ kde {
   buildInputs = [ qt4 ];
   nativeBuildInputs = [ cmake ];
 
-  patches = [ ./smokegen-nix.patch ];
+  patches = [ ./smokegen-SmokeConfig.cmake.in-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
 
   meta = {
     description = "C++ parser used to generate language bindings for Qt/KDE";