diff options
| author | Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de> | 2019-01-03 01:52:29 +0100 |
|---|---|---|
| committer | Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de> | 2019-01-13 00:09:38 +0100 |
| commit | 4b76c4605ecc61e22a0fce8e90a7b2f484db7f42 (patch) | |
| tree | fa6899ef792199dce762c12bdaf351a4f146627d /pkgs/development/libraries/qt-5 | |
| parent | a59e7297c1b864f7b5f33c234ead3a94f627d8f5 (diff) | |
| download | nixlib-4b76c4605ecc61e22a0fce8e90a7b2f484db7f42.tar nixlib-4b76c4605ecc61e22a0fce8e90a7b2f484db7f42.tar.gz nixlib-4b76c4605ecc61e22a0fce8e90a7b2f484db7f42.tar.bz2 nixlib-4b76c4605ecc61e22a0fce8e90a7b2f484db7f42.tar.lz nixlib-4b76c4605ecc61e22a0fce8e90a7b2f484db7f42.tar.xz nixlib-4b76c4605ecc61e22a0fce8e90a7b2f484db7f42.tar.zst nixlib-4b76c4605ecc61e22a0fce8e90a7b2f484db7f42.zip | |
qt511.qtdeclarative: fix CMake `qmlcachegen` path
This package contains several CMake files used for setting up its
provided tools for use in other projects build with CMake.
While packaging *ktouch* I found out that the ${_qt5Core_install_prefix}
variable doesn't expand at all, rendering the path to the `qmlcachegen`
binary useless. As a fix, the command itself is used instead of the path
to the binary.
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch index 8f5b5d4790fb..cfa68eb8102c 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch @@ -18,6 +18,19 @@ index 005db4248..685c5b1b2 100644 // env import paths if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); +diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +index 56cb3fb55..74509d601 100644 +--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake ++++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +@@ -17,7 +17,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles) + + find_package(Qt5 COMPONENTS Qml Core) + +- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen") ++ set(compiler_path "qmlcachegen") + + get_target_property(rcc_path ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION) + diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index 537eaf62e..e21de58f6 100644 --- a/tools/qmlcachegen/qmlcache.prf |