Skip to content

libe57format: 3.2.0 -> 3.3.0 #496870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hesiod wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libe57format: 3.2.0 -> 3.3.0 #496870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions pkgs/by-name/li/libe57format/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,27 @@
stdenv,
cmake,
fetchFromGitHub,
fetchpatch,
nix-update-script,
xercesc,
gtest,
}:

stdenv.mkDerivation (finalAttrs: {
pname = "libe57format";
version = "3.2.0";
version = "3.3.0";

src = fetchFromGitHub {
owner = "asmaloney";
repo = "libE57Format";
rev = "v${finalAttrs.version}";
hash = "sha256-GyzfJshL2cOTEDp8eR0sqQq4GSnOdskiLi5mY1a2KW0=";
fetchSubmodules = true; # for submodule-vendored libraries such as `gtest`
tag = "v${finalAttrs.version}";
hash = "sha256-rEX251cgb6GMToGzcZcwDzjLZBGcwN8+ij1nCIpK2ZE=";
};

postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
rmdir test/extern/googletest
ln -s ${gtest.src} test/extern/googletest
'';

# Repository of E57 files used for testing.
libE57Format-test-data_src = fetchFromGitHub {
owner = "asmaloney";
Expand All @@ -27,16 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-JARpxp6Z2VioBfY0pZSyQU2mG/EllbaF3qteSFM9u8o=";
};

env.CXXFLAGS = toString [
# GCC 13: error: 'int16_t' has not been declared in 'std'
"-include cstdint"
];

nativeBuildInputs = [
cmake
];

buildInputs = [
propagatedBuildInputs = [
xercesc
];

Expand Down Expand Up @@ -72,11 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
g++ -Wl,--no-undefined -shared -o libE57FormatShared.so -L. -Wl,-whole-archive -lE57Format -Wl,-no-whole-archive -lxerces-c
mv libE57FormatShared.so libE57Format.so

if [ "$dontDisableStatic" -ne "1" ]; then
if [ "''${dontDisableStatic:-1}" -ne "1" ]; then
rm libE57Format.a
fi
'';

passthru.updateScript = nix-update-script { };

meta = {
description = "Library for reading & writing the E57 file format";
homepage = "https://github.com/asmaloney/libE57Format";
Expand Down
2 changes: 0 additions & 2 deletions pkgs/by-name/pd/pdal/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
proj,
sqlite,
tiledb,
xercesc,
zlib,
zstd,
}:
Expand Down Expand Up @@ -59,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
proj
sqlite
tiledb
xercesc
zlib
zstd
]
Expand Down
Loading