init: opencascade-occt-vtk-qt (99d67cd8) · Commits · mdf / nixpkgs

pkgs/by-name/op/opencascade-occt/package.nix

+55 −2

Original line number	Diff line number	Diff line
		<<<<<<< HEAD:pkgs/by-name/op/opencascade-occt/package.nix
		{
		lib,
		stdenv,
		@@ -14,6 +15,37 @@
		libXmu,
		libXi,
		darwin,
		\|\|\|\|\|\|\| parent of bb49bdaa64f0 (init: opencascade-occt-vtk-qt):pkgs/development/libraries/opencascade-occt/default.nix
		{ lib
		, stdenv
		, fetchurl
		, cmake
		, ninja
		, tcl
		, tk
		, libGL
		, libGLU
		, libXext
		, libXmu
		, libXi
		, darwin
		=======
		{ lib
		, stdenv
		, fetchurl
		, cmake
		, ninja
		, tcl
		, tk
		, libGL
		, libGLU
		, libXext
		, libXmu
		, libXi
		, vtk
		, darwin
		, withVtk ? false
		>>>>>>> bb49bdaa64f0 (init: opencascade-occt-vtk-qt):pkgs/development/libraries/opencascade-occt/default.nix
		}:

		stdenv.mkDerivation rec {
		@@ -41,7 +73,7 @@ stdenv.mkDerivation rec {
		ninja
		];

		buildInputs = [
		propagatedBuildInputs = [
		tcl
		tk
		libGL
		@@ -49,8 +81,30 @@ stdenv.mkDerivation rec {
		libXext
		libXmu
		libXi
		<<<<<<< HEAD:pkgs/by-name/op/opencascade-occt/package.nix
		rapidjson
		] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa;
		\|\|\|\|\|\|\| parent of bb49bdaa64f0 (init: opencascade-occt-vtk-qt):pkgs/development/libraries/opencascade-occt/default.nix
		] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa;
		=======
		] ++ lib.optionals withVtk [
		vtk
		] ++ lib.optionals stdenv.hostPlatform.isDarwin [
		darwin.apple_sdk.frameworks.Cocoa
		];

		buildInputs = [
		# NOP
		];

		cmakeFlags = [
		# NOP
		] ++ lib.optionals withVtk [
		"-DUSE_VTK=ON"
		"-D3RDPARTY_VTK_INCLUDE_DIR=${vtk}/include/vtk"
		"-DBUILD_MODULE_VISUALIZATION=ON"
		];
		>>>>>>> bb49bdaa64f0 (init: opencascade-occt-vtk-qt):pkgs/development/libraries/opencascade-occt/default.nix

		NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
		cmakeFlags = [ "-DUSE_RAPIDJSON=ON" ];
		@@ -64,5 +118,4 @@ stdenv.mkDerivation rec {
		maintainers = with maintainers; [ amiloradovsky ];
		platforms = platforms.all;
		};

		}

pkgs/top-level/all-packages.nix

+9 −0

Original line number	Diff line number	Diff line
		@@ -10721,6 +10721,13 @@ with pkgs;
		python = python3;
		};

		opencascade-occt = callPackage ../development/libraries/opencascade-occt { };

		opencascade-occt-vtk-qt = callPackage ../development/libraries/opencascade-occt {
		vtk = vtk-qt;
		withVtk = true;
		};

		opencascade-occt_7_6 = opencascade-occt.overrideAttrs rec {
		pname = "opencascade-occt";
		version = "7.6.2";
		@@ -11421,6 +11428,8 @@ with pkgs;
		};

		vtk = qt6Packages.callPackage ../development/libraries/vtk {

		vtk = callPackage ../development/libraries/vtk {
		# NOP
		};