lib3mf: 2.3.2 -> 2.4.1, fix build, add updateScript (#424347)
This commit is contained in:
commit
10b60fa635
@ -2,6 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchpatch,
|
||||||
cmake,
|
cmake,
|
||||||
ninja,
|
ninja,
|
||||||
automaticcomponenttoolkit,
|
automaticcomponenttoolkit,
|
||||||
@ -12,19 +13,35 @@
|
|||||||
openssl,
|
openssl,
|
||||||
libuuid,
|
libuuid,
|
||||||
zlib,
|
zlib,
|
||||||
|
nix-update-script,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "lib3mf";
|
pname = "lib3mf";
|
||||||
version = "2.3.2";
|
version = "2.4.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "3MFConsortium";
|
owner = "3MFConsortium";
|
||||||
repo = "lib3mf";
|
repo = "lib3mf";
|
||||||
tag = "v${version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-XEwrJINiNpI2+1wXxczirci8VJsUVs5iDUAMS6jWuNk=";
|
hash = "sha256-wq/dT/8m+em/qFoNNj6s5lyx/MgNeEBGSMBpuJiORqA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# some patches are required for the gcc 14 source build
|
||||||
|
# remove next release
|
||||||
|
# https://github.com/3MFConsortium/lib3mf/pull/413
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/3MFConsortium/lib3mf/pull/413/commits/96b2f5ec9714088907fe8a6f05633e2bbd82053f.patch?full_index=1";
|
||||||
|
hash = "sha256-cJRc+SW1/6Ypf2r34yroVTxu4NMJWuoSmzsmoXogrUk=";
|
||||||
|
})
|
||||||
|
# https://github.com/3MFConsortium/lib3mf/pull/421
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/3MFConsortium/lib3mf/pull/421/commits/6d7b5709a4a1cf9bd55ae8b4ae999c9ca014f62c.patch?full_index=1";
|
||||||
|
hash = "sha256-rGOyXZUZglRNMu1/oVhgSpRdi0pUa/wn5SFHCS9jVOY=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
ninja
|
ninja
|
||||||
@ -79,11 +96,14 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
changelog = "https://github.com/3MFConsortium/lib3mf/releases/tag/${finalAttrs.src.tag}";
|
||||||
description = "Reference implementation of the 3D Manufacturing Format file standard";
|
description = "Reference implementation of the 3D Manufacturing Format file standard";
|
||||||
homepage = "https://3mf.io/";
|
homepage = "https://3mf.io/";
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user