Merge pull request #179646 from jtojnar/gmic-qt-system

gmic-qt: Use system gmic

pkgs/development/libraries/cimg/default.nix

@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cimg";
-  version = "3.0.2";
+  version = "3.1.4";
 
   src = fetchFromGitHub {
     owner = "dtschump";
     repo = "CImg";
     rev = "v.${version}";
-    hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk=";
+    hash = "sha256-nHYRs8X8I0B76SlgqWez3qubrsG7iBfa0I/G78v7H8g=";
   };
 
   outputs = [ "out" "doc" ];

pkgs/tools/graphics/gmic-qt/default.nix

@@ -1,10 +1,10 @@
 { lib
 , mkDerivation
-, fetchurl
 , variant ? "standalone"
 , fetchFromGitHub
 , cmake
 , pkg-config
+, ninja
 , opencv3
 , openexr
 , graphicsmagick
@@ -16,6 +16,8 @@
 , curl
 , krita ? null
 , gimp ? null
+, gmic
+, cimg
 , qtbase
 , qttools
 , writeShellScript
@@ -56,48 +58,24 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps
 
 mkDerivation rec {
   pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
-  version = "3.0.0";
+  version = "3.1.5";
 
-  gmic-community = fetchFromGitHub {
+  src = fetchFromGitHub {
-    owner = "dtschump";
-    repo = "gmic-community";
-    rev = "df23b08bc52767762f0e38d040cd8ffeea4b865e";
-    sha256 = "euk5RsFPBgx2czAukPRdi/O4ahgXO8J8VJdiGHNge5M=";
-  };
-
-  CImg = fetchFromGitHub {
-    owner = "dtschump";
-    repo = "CImg";
-    rev = "v.${version}";
-    sha256 = "dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg=";
-  };
-
-  gmic_stdlib = fetchurl {
-    name = "gmic_stdlib.h";
-    url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
-    sha256 = "CAYSxw5NCmE29hie1/J1csBcdQvIrmZ/+mNMl0sLLGI=";
-  };
-
-  gmic = fetchFromGitHub {
-    owner = "dtschump";
-    repo = "gmic";
-    rev = "v.${version}";
-    sha256 = "PyeJmjOqjbHlZ1Xl3IpoOD6oZEcUrHNHqF7Ft1RZDL4=";
-  };
-
-  gmic_qt = fetchFromGitHub {
     owner = "c-koi";
     repo = "gmic-qt";
     rev = "v.${version}";
-    sha256 = "nENXumOArRAHENqnBUjM7m+I5hf/WAFTVfm6cJgnv+0=";
+    sha256 = "rSBdh6jhiVZogZADEKn3g7bkGPnWWOEnRF0jNCe1BCk=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    ninja
   ];
 
   buildInputs = [
+    gmic
+    cimg
     qtbase
     qttools
     fftw
@@ -113,18 +91,13 @@ mkDerivation rec {
 
   cmakeFlags = [
     "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}"
+    "-DENABLE_SYSTEM_GMIC:BOOL=ON"
   ];
 
-  unpackPhase = ''
+  postPatch = ''
-    cp -r ${gmic} gmic
+    patchShebangs \
-    ln -s ${gmic-community} gmic-community
+      translations/filters/csv2ts.sh \
-    cp -r ${gmic_qt} gmic_qt
+      translations/lrelease.sh
-    chmod -R +w gmic gmic_qt
-    ln -s ${CImg} CImg
-
-    cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
-
-    cd gmic_qt
   '';
 
   postFixup = lib.optionalString (variant == "gimp") ''
@@ -132,33 +105,6 @@ mkDerivation rec {
     wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt"
   '';
 
-  passthru = {
-    updateScript = writeShellScript "${pname}-update-script" ''
-      set -o errexit
-      PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]}
-
-      latestVersion=$(curl 'https://gmic.eu/files/source/' | grep -E 'gmic_[^"]+\.tar\.gz' | sed -E 's/.+<a href="gmic_([^"]+)\.tar\.gz".+/\1/g' | sort --numeric-sort --reverse | head -n1)
-
-      if [[ "${version}" = "$latestVersion" ]]; then
-          echo "The new version same as the old version."
-          exit 0
-      fi
-
-      # gmic-community is not versioned so let’s just update to master.
-      communityLatestCommit=$(curl "https://api.github.com/repos/dtschump/gmic-community/commits/master")
-      communityLatestSha=$(echo "$communityLatestCommit" | jq .sha --raw-output)
-      communityLatestDate=$(echo "$communityLatestCommit" | jq .commit.committer.date --raw-output | sed 's/T.\+//')
-      update-source-version --source-key=gmic-community "gmic-qt" "unstable-$communityLatestDate" --rev="$communityLatestSha"
-
-      for component in CImg gmic_stdlib gmic gmic_qt; do
-          # The script will not perform an update when the version attribute is up to date from previous platform run
-          # We need to clear it before each run
-          update-source-version "--source-key=$component" "gmic-qt" 0 "$(printf '0%.0s' {1..64})"
-          update-source-version "--source-key=$component" "gmic-qt" $latestVersion
-      done
-    '';
-  };
-
   meta = with lib; {
     description = variants.${variant}.description;
     homepage = "http://gmic.eu/";

pkgs/tools/graphics/gmic/default.nix

@@ -1,4 +1,6 @@
-{ lib, stdenv
+{ stdenv
+, lib
+, fetchFromGitHub
 , fetchurl
 , cmake
 , ninja
@@ -6,22 +8,40 @@
 , opencv
 , openexr
 , graphicsmagick
+, cimg
 , fftw
 , zlib
 , libjpeg
 , libtiff
 , libpng
+, writeShellScript
+, common-updater-scripts
+, curl
+, gnugrep
+, gnused
+, coreutils
+, jq
 }:
 
 stdenv.mkDerivation rec {
   pname = "gmic";
-  version = "3.0.0";
+  version = "3.1.5";
 
   outputs = [ "out" "lib" "dev" "man" ];
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
+    owner = "dtschump";
-    sha256 = "sha256-PwVruebb8GdK9Mjc5Z9BmBchh2Yvf7s2zGPryMG3ESA=";
+    repo = "gmic";
+    rev = "326ea9b7dc320b3624fe660d7b7d81669ca12e6d";
+    sha256 = "RRCzYMN/IXViiUNnacJV3DNpku3hIHQkHbIrtixExT0=";
+  };
+
+  # TODO: build this from source
+  # https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729
+  gmic_stdlib = fetchurl {
+    name = "gmic_stdlib.h";
+    url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
+    sha256 = "FM8RscCrt6jYlwVB2DtpqYrh9B3pO0I6Y69tkf9W1/o=";
   };
 
   nativeBuildInputs = [
@@ -31,6 +51,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    cimg
     fftw
     zlib
     libjpeg
@@ -45,8 +66,38 @@ stdenv.mkDerivation rec {
     "-DBUILD_LIB_STATIC=OFF"
     "-DENABLE_CURL=OFF"
     "-DENABLE_DYNAMIC_LINKING=ON"
+    "-DUSE_SYSTEM_CIMG=ON"
   ];
 
+  postPatch = ''
+    # TODO: build from source
+    cp -r ${gmic_stdlib} src/gmic_stdlib.h
+
+    # CMake build files were moved to subdirectory.
+    mv resources/CMakeLists.txt resources/cmake .
+  '';
+
+  passthru = {
+    updateScript = writeShellScript "${pname}-update-script" ''
+      set -o errexit
+      PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]}
+
+      latestVersion=$(curl 'https://gmic.eu/files/source/' | grep -E 'gmic_[^"]+\.tar\.gz' | sed -E 's/.+<a href="gmic_([^"]+)\.tar\.gz".+/\1/g' | sort --numeric-sort --reverse | head -n1)
+
+      if [[ "${version}" = "$latestVersion" ]]; then
+          echo "The new version same as the old version."
+          exit 0
+      fi
+
+      for component in src gmic_stdlib; do
+          # The script will not perform an update when the version attribute is up to date from previous platform run
+          # We need to clear it before each run
+          update-source-version "--source-key=$component" "gmic" 0 "$(printf '0%.0s' {1..64})"
+          update-source-version "--source-key=$component" "gmic" $latestVersion
+      done
+    '';
+  };
+
   meta = with lib; {
     description = "Open and full-featured framework for image processing";
     homepage = "https://gmic.eu/";