summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2023-01-08 12:02:57 +0000
committerGitHub <noreply@github.com>2023-01-08 12:02:57 +0000
commitb9a864c04dd71aa17e13852801c0367723531b79 (patch)
tree45249d76c387b1d818f225c52876ab251df9f433
parent3db5c89b986801f15589ca5b14627b45c07d0aa7 (diff)
parent73b7cd526c4d458c701472593c4060ea9bd319ac (diff)
Merge pull request #208988 from wegank/liblas-darwin
libLAS: unbreak on aarch64-darwin
-rw-r--r--pkgs/development/libraries/libLAS/default.nix12
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
index 19bb1ba2afa7..3fd247dc4e82 100644
--- a/pkgs/development/libraries/libLAS/default.nix
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
+{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "libLAS";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
};
+ patches = [
+ (fetchpatch {
+ name = "aarch64-darwin.patch";
+ url = "https://github.com/libLAS/libLAS/commit/ded463732db1f9baf461be6f3fe5b8bb683c41cd.patch";
+ sha256 = "sha256-aWMpazeefDHE9OzuLR3FJ8+oXeGhEsk1igEm6j2DUnw=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ];
@@ -31,7 +39,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.michelk ];
- # never built on aarch64-darwin since first introduction in nixpkgs
- broken = stdenv.isDarwin && stdenv.isAarch64;
};
}