Unverified Commit 87daa5b0 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #218074: gmic-qt: fix build with 3.2.1

parents 9918d653 fd3e2b49

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

+17 −11
Original line number Diff line number Diff line 
{ lib

, mkDerivation

, variant ? "standalone"

, fetchFromGitHub

, fetchzip

, fetchpatch

, cmake

, pkg-config

, ninja
@@ -16,7 +17,6 @@ 
, curl

, gimp ? null

, gmic

, cimg

, qtbase

, qttools

, writeShellScript
@@ -54,13 +54,21 @@ mkDerivation rec { 
  pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";

  version = "3.2.1";



  src = fetchFromGitHub {

    owner = "c-koi";

    repo = "gmic-qt";

    rev = "v.${version}";

    sha256 = "sha256-z+GtYLBcHVufXwdeSd8WKmPmU1+/EKMv26kNaEgyt5w=";

  src = fetchzip {

    url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";

    hash = "sha256-2lMnn19FcFKnfIjSxOObqxIjqLMUoWgi0ADZBCBePY4=";

  };



  patches = [

    (fetchpatch {

      name = "gmic-qt-3.2.1-fix-system-gmic.patch";

      url = "https://github.com/c-koi/gmic-qt/commit/e8d7a3523753ff592da63b1d54edf0921c54fe53.patch";

      hash = "sha256-kBFZo2qvod4pH3oK8gvnmw39x6eMH9zjr4mMcY74mFo=";

    })

  ];



  sourceRoot = "source/gmic-qt";



  nativeBuildInputs = [

    cmake

    pkg-config
@@ -69,7 +77,6 @@ mkDerivation rec { 


  buildInputs = [

    gmic

    cimg

    qtbase

    qttools

    fftw
@@ -85,7 +92,8 @@ mkDerivation rec { 


  cmakeFlags = [

    "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}"

    "-DENABLE_SYSTEM_GMIC:BOOL=ON"

    "-DENABLE_SYSTEM_GMIC=ON"

    "-DENABLE_DYNAMIC_LINKING=ON"

  ];



  postPatch = ''
@@ -108,8 +116,6 @@ mkDerivation rec { 
  };



  meta = with lib; {

    # Broken since 3.2.0 update, cannot handle system gmic and cimg.

    broken = true;

    description = variants.${variant}.description;

    homepage = "http://gmic.eu/";

    license = licenses.gpl3Plus;

pkgs/tools/graphics/gmic/default.nix

+9 −0
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitHub

, fetchpatch

, fetchurl

, cmake

, ninja
@@ -37,6 +38,14 @@ stdenv.mkDerivation rec { 
    hash = "sha256-oEH4GlSV+642TGSJJhV4yzydh1hAQZfzwaiPAZFNQtI=";

  };



  patches = [

    (fetchpatch {

      name = "gmic-3.2.1-fix-system-gmic.patch";

      url = "https://github.com/GreycLab/gmic/commit/9db3f6a39d9ed67b4279654da88993a8057575ff.patch";

      hash = "sha256-JznKCs56t6cJ4HLqlhMZjSOupEB8cdkn3j6RgZpcpzo=";

    })

  ];



  # TODO: build this from source

  # https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729

  gmic_stdlib = fetchurl {