Unverified Commit 78b123a5 authored by Ivan Mincik's avatar Ivan Mincik Committed by GitHub
Browse files

Merge pull request #320290 from quantenzitrone/laszip 

LASzip{,2}: rename to laszip{,_2}
parents 92487a01 ad99f94c

pkgs/applications/graphics/cloudcompare/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
, flann

, gdal

, gmp

, LASzip

, laszip

, mpfr

, pdal

, pcl
@@ -48,7 +48,7 @@ mkDerivation rec { 
    flann

    gdal

    gmp

    LASzip

    laszip

    mpfr

    pdal

    pcl

pkgs/development/libraries/LASzip/default.nix→pkgs/by-name/la/laszip/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


stdenv.mkDerivation (finalAttrs: {

  version = "3.4.3";

  pname = "LASzip";

  pname = "laszip";



  src = fetchFromGitHub {

    owner = "LASzip";

pkgs/development/libraries/LASzip/LASzip2.nix→pkgs/by-name/la/laszip_2/package.nix

+4 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake }:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  version = "2.2.0";

  pname = "LASzip";

  pname = "laszip";



  src = fetchFromGitHub {

    owner = "LASzip";

    repo = "LASzip";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA=";

  };
@@ -20,4 +20,4 @@ stdenv.mkDerivation rec { 
    maintainers = [ maintainers.michelk ];

    platforms = platforms.unix;

  };

}
 
})

pkgs/development/libraries/libLAS/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:

{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, laszip_2, fixDarwinDylibNames }:



stdenv.mkDerivation rec {

  pname = "libLAS";
@@ -35,13 +35,13 @@ stdenv.mkDerivation rec { 
  ];



  nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

  buildInputs = [ boost libgeotiff libtiff LASzip2 ];

  buildInputs = [ boost libgeotiff libtiff laszip_2 ];



  cmakeFlags = [

    "-DWITH_LASZIP=ON"

    # libLAS is currently not compatible with LASzip 3,

    # see https://github.com/libLAS/libLAS/issues/144.

    "-DLASZIP_INCLUDE_DIR=${LASzip2}/include"

    "-DLASZIP_INCLUDE_DIR=${laszip_2}/include"

    "-DCMAKE_EXE_LINKER_FLAGS=-pthread"

  ];

pkgs/development/libraries/pdal/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
, curl

, gdal

, hdf5-cpp

, LASzip

, laszip

, libe57format

, libgeotiff

, libtiff
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { 
    curl

    gdal

    hdf5-cpp

    LASzip

    laszip

    libgeotiff

    libtiff

    libxml2