dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
h7x4 2024-10-03 18:12:03 +02:00 committed by GitHub
commit 8a585ebfe1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/by-name/gm/gmic-qt/package.nix
View File

@ -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 \

9
pkgs/by-name/gm/gmic/package.nix
View File

@ -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)
];