From 7123725134f153cb069bba16f12f9b15b10c90eb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 6 Jun 2023 20:50:06 +0300 Subject: [PATCH] libLAS: unpin boost172 --- pkgs/development/libraries/libLAS/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 3fd247dc4e82..fc55f14f118e 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -15,6 +15,16 @@ stdenv.mkDerivation rec { url = "https://github.com/libLAS/libLAS/commit/ded463732db1f9baf461be6f3fe5b8bb683c41cd.patch"; sha256 = "sha256-aWMpazeefDHE9OzuLR3FJ8+oXeGhEsk1igEm6j2DUnw="; }) + (fetchpatch { + name = "fix-build-with-boost-1.73-1.patch"; + url = "https://github.com/libLAS/libLAS/commit/af431abce95076b59f4eb7c6ef0930ca57c8a063.patch"; + hash = "sha256-2lr028t5hq3oOLZFXnvIJXCUsoVHbG/Mus93OZvi5ZU="; + }) + (fetchpatch { + name = "fix-build-with-boost-1.73-2.patch"; + url = "https://github.com/libLAS/libLAS/commit/0d3b8d75f371a6b7c605bbe5293091cb64a7e2d3.patch"; + hash = "sha256-gtNIazR+l1h+Xef+4qQc7EVi+Nlht3F8CrwkINothtA="; + }) ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 349550028226..59af08fce333 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21975,9 +21975,7 @@ with pkgs; libgtop = callPackage ../development/libraries/libgtop { }; - libLAS = callPackage ../development/libraries/libLAS { - boost = boost172; - }; + libLAS = callPackage ../development/libraries/libLAS { }; liblaxjson = callPackage ../development/libraries/liblaxjson { };