colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libredwg: 0.12.5.6313 -> 0.13.3

Browse Source
This commit is contained in:
Weijia Wang 2024-02-11 22:51:17 +01:00
parent a73d982d25
commit 720094c2d0
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/libredwg/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, autoreconfHook , autoreconfHook
, writeShellScript , writeShellScript
, pkg-config , pkg-config
@ -18,24 +17,16 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libredwg"; pname = "libredwg";
version = "0.12.5.6313"; version = "0.13.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LibreDWG"; owner = "LibreDWG";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-TM+cZ7N5PD6UG9cvy0XFa0sNYc3apbAJvEMh3husjRk="; hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
(fetchpatch {
name = "CVE-2023-26157.patch";
url = "https://github.com/LibreDWG/libredwg/commit/c8cf03ce4c2315b146caf582ea061c0460193bcc.patch";
hash = "sha256-EEF3YYPW+6SvXRiAw3zz6tWU9w/qmGtc09Tf8wn7hVc=";
})
];
postPatch = let postPatch = let
printVersion = writeShellScript "print-version" '' printVersion = writeShellScript "print-version" ''
echo -n ${lib.escapeShellArg version} echo -n ${lib.escapeShellArg version}
@ -43,8 +34,6 @@ stdenv.mkDerivation rec {
in '' in ''
# avoid git dependency # avoid git dependency
cp ${printVersion} build-aux/git-version-gen cp ${printVersion} build-aux/git-version-gen
# failing to build otherwise since glibc-2.38
sed '1i#include <string.h>' -i programs/dwg2SVG.c
''; '';
preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) ''
@ -64,8 +53,8 @@ stdenv.mkDerivation rec {
# prevent python tests from running when not building with python # prevent python tests from running when not building with python
configureFlags = lib.optional (!enablePython) "--disable-python"; configureFlags = lib.optional (!enablePython) "--disable-python";
# example_r13.dxf roundtrip fail: expect 5286, got 5285 entities # FAIL: alive.test
doCheck = !(stdenv.isLinux && stdenv.isAarch64); doCheck = !stdenv.isLinux;
# the "xmlsuite" test requires the libxml2 c library as well as the python module # the "xmlsuite" test requires the libxml2 c library as well as the python module
nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ];