Merge pull request #251960 from risicle/ris-libredwg-gt-0.12.5

libredwg: 0.12.5 -> 0.12.5.6248

authored by

Matthias Beyer and committed by
GitHub
b7b082bb 51651b1c

+13 -3
+13 -3
pkgs/development/libraries/libredwg/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , autoreconfHook 5 6 , writeShellScript 6 7 , pkg-config ··· 17 18 in 18 19 stdenv.mkDerivation rec { 19 20 pname = "libredwg"; 20 - version = "0.12.5"; 21 + version = "0.12.5.6248"; 21 22 22 23 src = fetchFromGitHub { 23 24 owner = "LibreDWG"; 24 25 repo = pname; 25 26 rev = version; 26 - sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE="; 27 + hash = "sha256-EHfqj+FeZZpQzF9/LFWg+onTMz2/9tvXNcdpZrdjry0="; 27 28 fetchSubmodules = true; 28 29 }; 29 30 31 + patches = [ 32 + (fetchpatch { 33 + name = "dwg2svg-strcasestr-musl-fix.patch"; 34 + # https://github.com/LibreDWG/libredwg/pull/822 35 + url = "https://github.com/LibreDWG/libredwg/commit/eec0b7aac6d2f695b7b258f47c3bde3f71f963ee.patch"; 36 + hash = "sha256-TjpJuhRl9t0b9NOJ1FEOO0/y586WwaJcNzTM0cTwmYI="; 37 + }) 38 + ]; 39 + 30 40 postPatch = let 31 41 printVersion = writeShellScript "print-version" '' 32 - echo ${lib.escapeShellArg version} 42 + echo -n ${lib.escapeShellArg version} 33 43 ''; 34 44 in '' 35 45 # avoid git dependency