BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #288144 from wegank/libredwg-bump

Browse source 
libredwg: 0.12.5.6313 -> 0.13.3
This commit is contained in:
Thomas Gerbet 2024-03-23 15:42:03 +01:00 committed by GitHub
commit ab67c4c3a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, writeShellScript
, pkg-config
@ -18,24 +17,16 @@ let
in
stdenv.mkDerivation rec {
pname = "libredwg";
version = "0.12.5.6313";
version = "0.13.3";
src = fetchFromGitHub {
owner = "LibreDWG";
repo = pname;
rev = version;
hash = "sha256-TM+cZ7N5PD6UG9cvy0XFa0sNYc3apbAJvEMh3husjRk=";
hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc=";
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
printVersion = writeShellScript "print-version" ''
echo -n ${lib.escapeShellArg version}
@ -43,8 +34,6 @@ stdenv.mkDerivation rec {
in ''
# avoid git dependency
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) ''
@ -64,8 +53,8 @@ stdenv.mkDerivation rec {
# prevent python tests from running when not building with python
configureFlags = lib.optional (!enablePython) "--disable-python";
# example_r13.dxf roundtrip fail: expect 5286, got 5285 entities
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
# FAIL: alive.test
doCheck = !stdenv.isLinux;
# the "xmlsuite" test requires the libxml2 c library as well as the python module
nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ];