zfp: fix build
This commit is contained in:
parent
412f8116f9
commit
205324547b
@ -16,17 +16,23 @@
|
|||||||
enableUtilities ? true,
|
enableUtilities ? true,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "zfp";
|
pname = "zfp";
|
||||||
version = "1.0.1";
|
version = "1.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "LLNL";
|
owner = "LLNL";
|
||||||
repo = "zfp";
|
repo = "zfp";
|
||||||
rev = version;
|
rev = finalAttrs.version;
|
||||||
sha256 = "sha256-iZxA4lIviZQgaeHj6tEQzEFSKocfgpUyf4WvUykb9qk=";
|
hash = "sha256-iZxA4lIviZQgaeHj6tEQzEFSKocfgpUyf4WvUykb9qk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# part of https://github.com/LLNL/zfp/pull/217
|
||||||
|
# Remove distutils
|
||||||
|
./python312.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
@ -64,13 +70,13 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
homepage = "https://computing.llnl.gov/projects/zfp";
|
homepage = "https://computing.llnl.gov/projects/zfp";
|
||||||
description = "Library for random-access compression of floating-point arrays";
|
description = "Library for random-access compression of floating-point arrays";
|
||||||
license = licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = [ maintainers.spease ];
|
maintainers = [ lib.maintainers.spease ];
|
||||||
# 64-bit only
|
# 64-bit only
|
||||||
platforms = platforms.aarch64 ++ platforms.x86_64;
|
platforms = lib.platforms.aarch64 ++ lib.platforms.x86_64;
|
||||||
mainProgram = "zfp";
|
mainProgram = "zfp";
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
43
pkgs/by-name/zf/zfp/python312.patch
Normal file
43
pkgs/by-name/zf/zfp/python312.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
From 6610107a865ddaf988a29fe0f07ece05949a0c77 Mon Sep 17 00:00:00 2001
|
||||||
|
From: wxt <3264117476@qq.com>
|
||||||
|
Date: Wed, 30 Oct 2024 18:20:51 +0800
|
||||||
|
Subject: [PATCH] a
|
||||||
|
|
||||||
|
---
|
||||||
|
python/scikit-build-cmake/FindPythonExtensions.cmake | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/python/scikit-build-cmake/FindPythonExtensions.cmake b/python/scikit-build-cmake/FindPythonExtensions.cmake
|
||||||
|
index 59b30c2..d06c9ad 100644
|
||||||
|
--- a/python/scikit-build-cmake/FindPythonExtensions.cmake
|
||||||
|
+++ b/python/scikit-build-cmake/FindPythonExtensions.cmake
|
||||||
|
@@ -254,7 +254,7 @@ endif()
|
||||||
|
include(targetLinkLibrariesWithDynamicLookup)
|
||||||
|
|
||||||
|
set(_command "
|
||||||
|
-import distutils.sysconfig
|
||||||
|
+import sysconfig
|
||||||
|
import itertools
|
||||||
|
import os
|
||||||
|
import os.path
|
||||||
|
@@ -266,7 +266,7 @@ rel_result = None
|
||||||
|
candidate_lists = []
|
||||||
|
|
||||||
|
try:
|
||||||
|
- candidate_lists.append((distutils.sysconfig.get_python_lib(),))
|
||||||
|
+ candidate_lists.append((sysconfig.get_paths()['purelib'],))
|
||||||
|
except AttributeError: pass
|
||||||
|
|
||||||
|
try:
|
||||||
|
@@ -293,7 +293,7 @@ sys.stdout.write(\";\".join((
|
||||||
|
sys.prefix,
|
||||||
|
result,
|
||||||
|
rel_result,
|
||||||
|
- distutils.sysconfig.get_config_var('EXT_SUFFIX')
|
||||||
|
+ sysconfig.get_config_var('EXT_SUFFIX')
|
||||||
|
)))
|
||||||
|
")
|
||||||
|
|
||||||
|
--
|
||||||
|
2.46.1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user