dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #136236 from nh2/libe57format-2.2.0

Browse Source 
libe57format: 2.1 -> 2.2.0
This commit is contained in:
Niklas Hambüchen 2021-08-31 11:02:11 +02:00 committed by GitHub
commit ccc9139fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/development/libraries/libe57format/default.nix
View File

@ -5,20 +5,17 @@
boost, boost,
xercesc, xercesc,
icu, icu,
dos2unix,
fetchpatch,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libe57format"; pname = "libe57format";
version = "2.1"; version = "2.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "asmaloney"; owner = "asmaloney";
repo = "libE57Format"; repo = "libE57Format";
rev = "v${version}"; rev = "v${version}";
sha256 = "05z955q68wjbd9gc5fw32nqg69xc82n2x75j5vchxzkgnn3adcpi"; sha256 = "15l23spjvak5h3n7aj3ggy0c3cwcg8mvnc9jlbd9yc2ra43bx7bp";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,31 +33,6 @@ stdenv.mkDerivation rec {
xercesc xercesc
]; ];
# TODO: Remove CMake patching when https://github.com/asmaloney/libE57Format/pull/60 is available.
# GNU patch cannot patch `CMakeLists.txt` that has CRLF endings,
# see https://unix.stackexchange.com/questions/239364/how-to-fix-hunk-1-failed-at-1-different-line-endings-message/243748#243748
# so convert it first.
prePatch = ''
${dos2unix}/bin/dos2unix CMakeLists.txt
'';
patches = [
(fetchpatch {
name = "libE57Format-cmake-Fix-config-filename.patch";
url = "https://github.com/asmaloney/libE57Format/commit/279d8d6b60ee65fb276cdbeed74ac58770a286f9.patch";
sha256 = "0fbf92hs1c7yl169i7zlbaj9yhrd1yg3pjf0wsqjlh8mr5m6rp14";
})
];
# It appears that while the patch has
# diff --git a/cmake/E57Format-config.cmake b/cmake/e57format-config.cmake
# similarity index 100%
# rename from cmake/E57Format-config.cmake
# rename to cmake/e57format-config.cmake
# GNU patch doesn't interpret that.
postPatch = ''
mv cmake/E57Format-config.cmake cmake/e57format-config.cmake
'';
# The build system by default builds ONLY static libraries, and with # The build system by default builds ONLY static libraries, and with
# `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see: # `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see:
# https://github.com/asmaloney/libE57Format/issues/48 # https://github.com/asmaloney/libE57Format/issues/48
@ -79,7 +51,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
description = "Library for reading & writing the E57 file format (fork of E57RefImpl)"; description = "Library for reading & writing the E57 file format";
homepage = "https://github.com/asmaloney/libE57Format"; homepage = "https://github.com/asmaloney/libE57Format";
license = licenses.boost; license = licenses.boost;
maintainers = with maintainers; [ chpatrick nh2 ]; maintainers = with maintainers; [ chpatrick nh2 ];