From 0677b9d8e66738284e7a31c50180f301d4146449 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 1 Feb 2021 15:57:18 +0100 Subject: [PATCH] libschrift: 0.9.1 -> 0.10.0 (#111152) --- .../development/libraries/libschrift/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix index 3781d934612..96b8c7ac2e5 100644 --- a/pkgs/development/libraries/libschrift/default.nix +++ b/pkgs/development/libraries/libschrift/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "libschrift"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "tomolt"; repo = pname; - rev = "c6d20460d6e602e8829d3a227fd7be4c4c3cda86"; - hash = "sha256-BuTmWaWFZ0DXujlbhbmK3Woit8fR9F4DWmKszHX6gOI="; + rev = "c207585486b3e78ec5506f55f5d56178f421a53c"; + sha256 = "13qrplsi2a53s84giwnzqmn0zbslyaagvjn89wsn9fd90m2v2bs1"; }; + # fix a compilation failure related to darwin integers, remove at next release + patches = [ + (fetchpatch { + url = "https://github.com/tomolt/libschrift/commit/1b1292f2cf4b582d66b2f6c87105997391f9fa08.patch"; + sha256 = "076l3n28famgi74nr5bz47yn192bm76p8c8558fm5zj5c21pcfsv"; + }) + ]; + postPatch = '' substituteInPlace config.mk \ --replace "PREFIX = /usr/local" "PREFIX = $out"