From a1caaaf7a432c85f84d92371d76a22020510cd12 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 5 Jun 2023 17:50:42 +0300 Subject: [PATCH] libnest2d: unpin boost174 --- pkgs/development/libraries/libnest2d/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix index 4117b38e1d9b..b3aba528f924 100644 --- a/pkgs/development/libraries/libnest2d/default.nix +++ b/pkgs/development/libraries/libnest2d/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: +{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "4.12.0"; pname = "libnest2d"; @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1hzqi4z55x76rss3xk7hfqhy9hcaq2jaav5jqxa1aqmbvarr2gla"; }; + postPatch = '' + substituteInPlace {,examples/}CMakeLists.txt \ + --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" + ''; + propagatedBuildInputs = [ clipper nlopt boost ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83f860c73c09..162d13682a2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22422,9 +22422,7 @@ with pkgs; libndctl = callPackage ../development/libraries/libndctl { }; - libnest2d = callPackage ../development/libraries/libnest2d { - boost = boost174; - }; + libnest2d = callPackage ../development/libraries/libnest2d { }; libnet = callPackage ../development/libraries/libnet { };