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

Merge pull request #799 from qknight/qtruby-patch-fixes

Browse Source 
qtruby patch fixes
This commit is contained in:
Joachim Schiele 2013-08-21 00:50:53 -07:00
commit a8a7c78f89
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch
View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33078b4..1a6ad2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
find_package(Ruby REQUIRED)
find_package(Qt4 REQUIRED)
find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt)
-include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
include(MacroOptionalFindPackage)

4
pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
View File

@ -5,9 +5,7 @@ kde {
buildInputs = [ smokeqt ruby ]; buildInputs = [ smokeqt ruby ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
# The second patch is not ready for upstream submmission. I should add an patches = [ ./qtruby-install-prefix.patch ];
# option() instead.
patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ];
cmakeFlags="-DRUBY_ROOT_DIR=${ruby}"; cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";