diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-07 12:01:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-07 12:01:13 +0000 |
| commit | fbefda346638e8dc4c62fa6bc75a3682cbd5e90f (patch) | |
| tree | 31ec54ce656a91d6ffd4f6eba8340d0b7ec12a98 /pkgs/tools/typesetting | |
| parent | f238a66a7cd9a875ce72c9e2f56a5ed2abfe865f (diff) | |
| parent | bc06c93905f60a82d6ebbb78f78cf289257860cc (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/sile/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 92062b8eac8a..049938581b67 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -3,9 +3,8 @@ , fetchurl , makeWrapper , pkg-config -, autoconf -, automake , poppler_utils +, gitMinimal , harfbuzz , icu , fontconfig @@ -39,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.15"; + version = "0.11.1"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0p1w3s6j34qi93aycqmqggfm277n90z90nlmm1j3qizxxwq5gda9"; + sha256 = "06bx94zx6skhizk2bbrid82sldwgxfycvjh6zx1zy1xz8gajgrm3"; }; configureFlags = [ @@ -52,8 +51,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoconf - automake + gitMinimal pkg-config makeWrapper ]; @@ -70,7 +68,9 @@ stdenv.mkDerivation rec { poppler_utils ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = '' + patchShebangs build-aux/*.sh + '' + lib.optionalString stdenv.isDarwin '' sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m ''; @@ -108,7 +108,8 @@ stdenv.mkDerivation rec { technologies and borrowing some ideas from graphical systems such as InDesign. ''; - homepage = "https://sile-typesetter.org/"; + homepage = "https://sile-typesetter.org"; + changelog = "https://github.com/sile-typesetter/sile/raw/v${version}/CHANGELOG.md"; platforms = platforms.unix; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018 maintainers = with maintainers; [ doronbehar alerque ]; |