diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 07:06:45 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 07:06:45 +0200 |
| commit | 1716d62f633cd091fce0d61517bb79504c300d36 (patch) | |
| tree | 5abe8333c83e247f364cf835efc7fc669d36c311 /pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch | |
| parent | dc051dfdef1ec4c9bdd90b228764b6c24372597e (diff) | |
| parent | 8752ff225446422b902d9f88d6f75f9928d4eb34 (diff) | |
| download | nixlib-1716d62f633cd091fce0d61517bb79504c300d36.tar nixlib-1716d62f633cd091fce0d61517bb79504c300d36.tar.gz nixlib-1716d62f633cd091fce0d61517bb79504c300d36.tar.bz2 nixlib-1716d62f633cd091fce0d61517bb79504c300d36.tar.lz nixlib-1716d62f633cd091fce0d61517bb79504c300d36.tar.xz nixlib-1716d62f633cd091fce0d61517bb79504c300d36.tar.zst nixlib-1716d62f633cd091fce0d61517bb79504c300d36.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch')
| -rw-r--r-- | pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch b/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch new file mode 100644 index 000000000000..ac0600fb76c3 --- /dev/null +++ b/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1483056..26d2b9a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -473,6 +473,7 @@ + + execute_process(COMMAND gimptool-2.0 --libs-noui OUTPUT_VARIABLE GIMP2_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND gimptool-2.0 --cflags-noui OUTPUT_VARIABLE GIMP2_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE) ++ execute_process(COMMAND pkg-config gimp-2.0 --define-variable=prefix=${CMAKE_INSTALL_PREFIX} --variable gimplibdir OUTPUT_VARIABLE GIMP2_PKGLIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GIMP2_INCLUDE_DIRS}") + + set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/Gimp/host_gimp.cpp) +@@ -484,7 +485,7 @@ + ${GIMP2_LIBRARIES} + ${gmic_qt_LIBRARIES} + ) +- install(TARGETS gmic_gimp_qt RUNTIME DESTINATION bin) ++ install(TARGETS gmic_gimp_qt RUNTIME DESTINATION "${GIMP2_PKGLIBDIR}/plug-ins") + + elseif (${GMIC_QT_HOST} STREQUAL "krita") + |