Unverified Commit d3eef293 authored by Vladimír Čunát's avatar Vladimír Čunát Committed by GitHub
Browse files

libnest2d, python3Packages.libsavitar: fix build with cmake4;...

libnest2d, python3Packages.libsavitar: fix build with cmake4; python3Packages.libarcus, python3Packages.pynest2d: fix build (#458513)
parents 66f909fa 1218c9ca
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ stdenv.mkDerivation {
  postPatch = ''
    substituteInPlace {,examples/}CMakeLists.txt \
      --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)"
    substituteInPlace CMakeLists.txt \
      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"

  '';

  propagatedBuildInputs = [
+13 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
  cmake,
  sip4,
  protobuf,
  distutils,
}:

buildPythonPackage rec {
@@ -30,16 +31,25 @@ buildPythonPackage rec {
    })
  ];

  propagatedBuildInputs = [ sip4 ];
  nativeBuildInputs = [ cmake ];
  propagatedBuildInputs = [
    sip4
    distutils
  ];

  nativeBuildInputs = [
    cmake
    sip4
  ];

  buildInputs = [ protobuf ];

  strictDeps = true;

  postPatch = ''
    sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
  '';

  meta = with lib; {
    broken = true;
    description = "Communication library between internal components for Ultimaker software";
    homepage = "https://github.com/Ultimaker/libArcus";
    license = licenses.lgpl3Plus;
+17 −9
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@
  fetchFromGitHub,
  cmake,
  sip4,
  distutils,
}:

buildPythonPackage rec {
@@ -22,21 +23,28 @@ buildPythonPackage rec {

  postPatch = ''
    sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake

    substituteInPlace pugixml/CMakeLists.txt \
      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
  '';

  nativeBuildInputs = [ cmake ];
  nativeBuildInputs = [
    cmake
    sip4
  ];

  propagatedBuildInputs = [ sip4 ];
  propagatedBuildInputs = [
    sip4
    distutils
  ];

  disabled = pythonOlder "3.4.0";
  strictDeps = true;

  meta = with lib; {
  meta = {
    description = "C++ implementation of 3mf loading with SIP python bindings";
    homepage = "https://github.com/Ultimaker/libSavitar";
    license = licenses.lgpl3Plus;
    platforms = platforms.unix;
    maintainers = with maintainers; [
      orivej
    ];
    license = lib.licenses.lgpl3Plus;
    platforms = lib.platforms.unix;
    maintainers = with lib.maintainers; [ orivej ];
  };
}
+8 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
  libnest2d,
  sip4,
  clipper,
  distutils,
}:

buildPythonPackage rec {
@@ -25,8 +26,14 @@ buildPythonPackage rec {
    libnest2d
    sip4
    clipper
    distutils
  ];
  nativeBuildInputs = [ cmake ];
  nativeBuildInputs = [
    cmake
    sip4
  ];

  strictDeps = true;

  CLIPPER_PATH = "${clipper.out}";