diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix index 21f21231f5fa..aacf40f49afa 100644 --- a/pkgs/by-name/el/elmerfem/package.nix +++ b/pkgs/by-name/el/elmerfem/package.nix @@ -11,9 +11,9 @@ libGL, libGLU, opencascade-occt, - libsForQt5, + qt6Packages, tbb, - vtkWithQt5, + vtkWithQt6, llvmPackages, }: stdenv.mkDerivation rec { @@ -33,21 +33,20 @@ stdenv.mkDerivation rec { cmake gfortran pkg-config - libsForQt5.wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; buildInputs = [ mpi blas liblapack - libsForQt5.qtbase - libsForQt5.qtscript - libsForQt5.qwt + qt6Packages.qtbase + qt6Packages.qwt libGL libGLU opencascade-occt tbb - vtkWithQt5 + vtkWithQt6 ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; @@ -55,22 +54,23 @@ stdenv.mkDerivation rec { patchShebangs ./ ''; - storepath = placeholder "out"; - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; cmakeFlags = [ - "-DELMER_INSTALL_LIB_DIR=${storepath}/lib" - "-DWITH_OpenMP:BOOLEAN=TRUE" - "-DWITH_MPI:BOOLEAN=TRUE" - "-DWITH_QT5:BOOLEAN=TRUE" - "-DWITH_OCC:BOOLEAN=TRUE" - "-DWITH_VTK:BOOLEAN=TRUE" - "-DWITH_ELMERGUI:BOOLEAN=TRUE" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND" - "-DUSE_MACOS_PACKAGE_MANAGER=False" + (lib.cmakeFeature "ELMER_INSTALL_LIB_DIR" "${placeholder "out"}/lib") + (lib.cmakeBool "WITH_OpenMP" true) + (lib.cmakeBool "WITH_MPI" true) + (lib.cmakeBool "WITH_QT6" true) + (lib.cmakeBool "WITH_OCC" true) + (lib.cmakeBool "WITH_VTK" true) + (lib.cmakeBool "WITH_ELMERGUI" true) + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_OpenGL_GL_PREFERENCE" "GLVND") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeBool "USE_MACOS_PACKAGE_MANAGER" false) + (lib.cmakeFeature "QWT_INCLUDE_DIR" "${qt6Packages.qwt}/lib/qwt.framework/Headers") ]; meta = with lib; {