diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2017-02-28 16:40:27 +0100 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2017-02-28 16:48:44 +0100 |
| commit | ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3 (patch) | |
| tree | bf66b17d4a4e84b35940a1c9a98f87e2c212607f /pkgs | |
| parent | e6541423b6679f6c0b6bc252f2f126953402e2af (diff) | |
| download | nixlib-ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3.tar nixlib-ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3.tar.gz nixlib-ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3.tar.bz2 nixlib-ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3.tar.lz nixlib-ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3.tar.xz nixlib-ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3.tar.zst nixlib-ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3.zip | |
qt5.qttools: fix path to qhelpgenerator
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch index fe5bcadbe9a8..e3db17e978c2 100644 --- a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch +++ b/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch @@ -1,7 +1,6 @@ -Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in -=================================================================== ---- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in -+++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in +diff -Naur qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in +--- qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in 2016-11-03 09:31:16.000000000 +0100 ++++ qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in 2017-02-28 16:37:20.130457615 +0100 @@ -2,11 +2,10 @@ if (NOT TARGET Qt5::qcollectiongenerator) add_executable(Qt5::qcollectiongenerator IMPORTED) @@ -18,11 +17,26 @@ Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake _qt5_Help_check_file_exists(${imported_location}) set_target_properties(Qt5::qcollectiongenerator PROPERTIES -Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in -=================================================================== ---- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in -+++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in -@@ -44,11 +44,10 @@ endmacro() +@@ -17,11 +16,10 @@ + if (NOT TARGET Qt5::qhelpgenerator) + add_executable(Qt5::qhelpgenerator IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") ++ endif() + _qt5_Help_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qhelpgenerator PROPERTIES +diff -Naur qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in +--- qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in 2016-11-03 09:31:16.000000000 +0100 ++++ qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in 2017-02-28 16:35:40.470100681 +0100 +@@ -44,11 +44,10 @@ if (NOT TARGET Qt5::lrelease) add_executable(Qt5::lrelease IMPORTED) @@ -38,7 +52,7 @@ Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in _qt5_LinguistTools_check_file_exists(${imported_location}) set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +58,10 @@ endif() +@@ -59,11 +58,10 @@ if (NOT TARGET Qt5::lupdate) add_executable(Qt5::lupdate IMPORTED) @@ -54,7 +68,7 @@ Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in _qt5_LinguistTools_check_file_exists(${imported_location}) set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +72,10 @@ endif() +@@ -74,11 +72,10 @@ if (NOT TARGET Qt5::lconvert) add_executable(Qt5::lconvert IMPORTED) |