mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
fixed patch rejection and added RPATH magic
This commit is contained in:
parent
91ad63716c
commit
7b5a92c49d
@ -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})
|
||||
|
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user