public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
fixed patch rejection and added RPATH magic
This commit is contained in:
Joachim Schiele 2013-08-21 00:51:31 -07:00
commit 99fe2013ae
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch Normal file
View File

@ -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})

0
pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch → pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch
View File

2
pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
View File

@ -4,7 +4,7 @@ kde {
buildInputs = [ qt4 ]; buildInputs = [ qt4 ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
patches = [ ./smokegen-nix.patch ]; patches = [ ./smokegen-SmokeConfig.cmake.in-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
meta = { meta = {
description = "C++ parser used to generate language bindings for Qt/KDE"; description = "C++ parser used to generate language bindings for Qt/KDE";