diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index 518c7a35c810..8cc39c1f44af 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -56,48 +56,42 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "2.7.1"; + version = "3.0.0"; gmic-community = fetchFromGitHub { owner = "dtschump"; repo = "gmic-community"; - rev = "3fd528f20a2a7d651e96078c205ff21efb9cdd1a"; - sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2"; + rev = "df23b08bc52767762f0e38d040cd8ffeea4b865e"; + sha256 = "euk5RsFPBgx2czAukPRdi/O4ahgXO8J8VJdiGHNge5M="; }; CImg = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "1mfkjvf5r3ppc1dd6yvqn7xlhgzfg9k1k5v2sq2k9m70g8p7rgpd"; + sha256 = "dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg="; }; gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; - sha256 = "0v12smknr1s44s6wq2gbnw0hb98xrwp6i3zg9wf49cl7s9qf76j3"; + sha256 = "CAYSxw5NCmE29hie1/J1csBcdQvIrmZ/+mNMl0sLLGI="; }; gmic = fetchFromGitHub { owner = "dtschump"; repo = "gmic"; rev = "v.${version}"; - sha256 = "0pa6kflr1gqgzh8rk7bylvkxs989r5jy0q7b62mnzx8895slwfb5"; + sha256 = "PyeJmjOqjbHlZ1Xl3IpoOD6oZEcUrHNHqF7Ft1RZDL4="; }; gmic_qt = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${version}"; - sha256 = "08a0660083wv5fb1w9qqhm4f8cfwbqq723qzqq647mid1n7sy959"; + sha256 = "nENXumOArRAHENqnBUjM7m+I5hf/WAFTVfm6cJgnv+0="; }; - patches = [ - # Install GIMP plug-in to a correct destination - # https://github.com/c-koi/gmic-qt/pull/78 - ./fix-gimp-plugin-path.patch - ]; - nativeBuildInputs = [ cmake pkg-config @@ -134,8 +128,8 @@ mkDerivation rec { ''; postFixup = lib.optionalString (variant == "gimp") '' - echo "wrapping $out/${gimp.targetPluginDir}/gmic_gimp_qt" - wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt" + echo "wrapping $out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt" + wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt" ''; passthru = { diff --git a/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch b/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch deleted file mode 100644 index ac0600fb76c3..000000000000 --- a/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -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") -