From 79474fd4c31d496bc51fa3ee80c96742527889e1 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 9 Sep 2024 19:46:59 +0000 Subject: [PATCH 1/2] gmic: enable OpenCV, OpenMP (Clang) and X11 fixes #265966 --- pkgs/by-name/gm/gmic/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 602f9cc80294..104ea8a2c7f7 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -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) ]; From cc0811a5dad333cefde6d50fe8c1fa0942d19f74 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 9 Sep 2024 19:46:59 +0000 Subject: [PATCH 2/2] gmic-qt: enable OpenMP (Clang) --- pkgs/by-name/gm/gmic-qt/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 5d097f13f5c6..06601e08fe4c 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -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 \