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

Merge pull request #236319 from wegank/liblas-boost

Browse Source 
libLAS: unpin boost172
This commit is contained in:
Weijia Wang
2023-06-07 00:32:52 +03:00
committed by GitHub
parent 5399c9ac5a 7123725134
commit 4dfd05a0ca
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libLAS/default.nix
+10
View File
@@ -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;
pkgs/top-level/all-packages.nix
+1 -3
View File
@@ -21974,9 +21974,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 { };