Unverified Commit 8a585ebf authored by h7x4's avatar h7x4 Committed by GitHub
Browse files

gmic{,-qt}: enable OpenCV, OpenMP (Clang) and X11 (#340855)

parents b7b1f8b0 cc0811a5

pkgs/by-name/gm/gmic-qt/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
, libpng

, libsForQt5

, libtiff

, llvmPackages

, ninja

, nix-update-script

, openexr
@@ -79,7 +80,9 @@ stdenv.mkDerivation (finalAttrs: { 
  ] ++ (with libsForQt5; [

    qtbase

    qttools

  ]) ++ variants.${variant}.extraDeps;

  ]) ++ lib.optionals stdenv.cc.isClang [

    llvmPackages.openmp

  ] ++ variants.${variant}.extraDeps;



  postPatch = ''

    patchShebangs \

pkgs/by-name/gm/gmic/package.nix

+9 −0
Original line number Diff line number Diff line
@@ -13,9 +13,12 @@ 
, gnused

, graphicsmagick

, jq

, libX11

, libXext

, libjpeg

, libpng

, libtiff

, llvmPackages

, ninja

, opencv

, openexr
@@ -55,18 +58,24 @@ stdenv.mkDerivation (finalAttrs: { 
    cimg

    fftw

    graphicsmagick

    libX11

    libXext

    libjpeg

    libpng

    libtiff

    opencv

    openexr

    zlib

  ] ++ lib.optionals stdenv.cc.isClang [

    llvmPackages.openmp

  ];



  cmakeFlags = [

    (lib.cmakeBool "BUILD_LIB_STATIC" false)

    (lib.cmakeBool "ENABLE_CURL" false)

    (lib.cmakeBool "ENABLE_DYNAMIC_LINKING" true)

    (lib.cmakeBool "ENABLE_OPENCV" true)

    (lib.cmakeBool "ENABLE_XSHM" true)

    (lib.cmakeBool "USE_SYSTEM_CIMG" true)

  ];