Author: urkud
Date: Tue Mar 20 22:10:53 2012
New Revision: 33313
URL: https://nixos.org/websvn/nix/?rev=33313&sc=1
Log:
Add kde48.qtruby
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/default.nix Tue Mar 20 22:02:27
2012 (r33312)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/default.nix Tue Mar 20 22:10:53
2012 (r33313)
@@ -15,8 +15,7 @@
# kdesdk/kioslave is splitted into kioslave-svn and kioslave-git
kdesdk = [ "kioslave" ];
# Most of kdebindings do not compile due to a bug in the buildsystem
- kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde"
- "qtruby" "qyoto" ];
+ kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto"
];
};
# Extra subpackages in the manifest format
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
Tue Mar 20 22:10:53 2012 (r33313)
@@ -0,0 +1,13 @@
+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)
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
Tue Mar 20 22:10:53 2012 (r33313)
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33078b4..30aec0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
+ return()
+ endif (NOT COMPILE_RUBY)
+
+-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom
installation directory for ruby binary extension" )
+-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom
installation directory for ruby extension" )
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}"
CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}"
CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
+
+ # compute an overall version number which can be compared at once
+ MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 +
${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
Added: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix Tue Mar 20
22:10:53 2012 (r33313)
@@ -0,0 +1,16 @@
+{ kde, cmake, smokeqt, ruby }:
+
+kde {
+ buildInputs = [ smokeqt ruby ];
+ buildNativeInputs = [ 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 ];
+
+ cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
+
+ meta = {
+ description = "Ruby bindings for Qt library";
+ };
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
