Unverified Commit 93c4b2dd authored by Ivan Mincik's avatar Ivan Mincik Committed by GitHub
Browse files

libe57format: 3.2.0 -> 3.3.0 (#496870)

parents ccc324b4 88b8f0ea

pkgs/by-name/li/libe57format/package.nix

+14 −12
Original line number Diff line number Diff line
@@ -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";
@@ -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

  ];
@@ -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";

pkgs/by-name/pd/pdal/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
  proj,

  sqlite,

  tiledb,

  xercesc,

  zlib,

  zstd,

}:
@@ -59,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { 
    proj

    sqlite

    tiledb

    xercesc

    zlib

    zstd

  ]