gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #236100 from wegank/libnest2d-boost

Browse Source 
libnest2d: unpin boost174
This commit is contained in:
Weijia Wang
2023-06-05 21:56:14 +03:00
committed by GitHub
parent afc7120bbd a1caaaf7a4
commit 21264766ff
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libnest2d/default.nix
+7 -2
View File
@@ -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 ];
pkgs/top-level/all-packages.nix
+1 -3
View File
@@ -22417,9 +22417,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 { };