diff options
| author | Joachim Schiele <js@lastlog.de> | 2013-08-21 00:50:53 -0700 |
|---|---|---|
| committer | Joachim Schiele <js@lastlog.de> | 2013-08-21 00:50:53 -0700 |
| commit | a8a7c78f892a55f8ec4527413f4d3aa1dcbb77c9 (patch) | |
| tree | 6c32272d957f2654e0215c356de9c92d976e6abd /pkgs | |
| parent | 7837b994bffe655bb19d448f8622a61ca78694ee (diff) | |
| parent | 9109cc6e4fd97929e3b04cd5a3dd18bbccc0b464 (diff) | |
| download | nixlib-a8a7c78f892a55f8ec4527413f4d3aa1dcbb77c9.tar nixlib-a8a7c78f892a55f8ec4527413f4d3aa1dcbb77c9.tar.gz nixlib-a8a7c78f892a55f8ec4527413f4d3aa1dcbb77c9.tar.bz2 nixlib-a8a7c78f892a55f8ec4527413f4d3aa1dcbb77c9.tar.lz nixlib-a8a7c78f892a55f8ec4527413f4d3aa1dcbb77c9.tar.xz nixlib-a8a7c78f892a55f8ec4527413f4d3aa1dcbb77c9.tar.zst nixlib-a8a7c78f892a55f8ec4527413f4d3aa1dcbb77c9.zip | |
Merge pull request #799 from qknight/qtruby-patch-fixes
qtruby patch fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch | 13 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.10/kdebindings/qtruby.nix | 4 |
2 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch b/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch deleted file mode 100644 index 7d20a3c1c0bc..000000000000 --- a/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch +++ /dev/null @@ -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) diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix index 29faf2af15c2..18a3703426c9 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix +++ b/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix @@ -5,9 +5,7 @@ kde { buildInputs = [ smokeqt ruby ]; nativeBuildInputs = [ cmake ]; - # The second patch is not ready for upstream submmission. I should add an - # option() instead. - patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ]; + patches = [ ./qtruby-install-prefix.patch ]; cmakeFlags="-DRUBY_ROOT_DIR=${ruby}"; |