Unverified Commit 4adb7b14 authored by Ben Siraphob's avatar Ben Siraphob Committed by GitHub
Browse files

Merge pull request #319014 from afh/fix-dune3d-darwin 

dune3d: Fix darwin build
parents 344394df 893a4fee

pkgs/by-name/du/dune3d/package.nix

+20 −10
Original line number Diff line number Diff line 
{

  cmake,

  desktopToDarwinBundle,

  eigen,

  fetchFromGitHub,

  glm,
@@ -7,26 +8,33 @@ 
  gtkmm4,

  lib,

  libepoxy,

  libossp_uuid,

  librsvg,

  libspnav,

  libuuid,

  libxml2,

  llvmPackages_17,

  meson,

  ninja,

  opencascade-occt,

  opencascade-occt_7_6,

  pkg-config,

  python3,

  stdenv,

  wrapGAppsHook3,

}:



stdenv.mkDerivation rec {

let

  stdenv' = if stdenv.isDarwin then llvmPackages_17.stdenv else stdenv;

  opencascade-occt = opencascade-occt_7_6;

in

stdenv'.mkDerivation (finalAttrs: {

  pname = "dune3d";

  version = "1.1.0";



  src = fetchFromGitHub {

    owner = "dune3d";

    repo = "dune3d";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4=";

  };
@@ -36,7 +44,9 @@ stdenv.mkDerivation rec { 
    ninja

    pkg-config

    wrapGAppsHook3

  ];

    libxml2 # for xmllints

  ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;



  buildInputs = [

    cmake

    eigen
@@ -45,7 +55,7 @@ stdenv.mkDerivation rec { 
    libepoxy

    librsvg

    libspnav

    libuuid

    (if stdenv.isLinux then libuuid else libossp_uuid)

    opencascade-occt

    (python3.withPackages (pp: [

      pp.pygobject3
@@ -54,12 +64,12 @@ stdenv.mkDerivation rec { 


  env.CASROOT = opencascade-occt;



  meta = with lib; {

  meta = {

    description = "3D CAD application";

    homepage = "https://dune3d.org";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ _0x4A6F jue89 ];

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ _0x4A6F jue89 ];

    mainProgram = "dune3d";

    platforms = platforms.linux;

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

  };

}
 
})