sile: 0.10.4 -> 0.10.9 (#94168)
* sile: reformatting, not changing drv at all Put all inputs on separate lines and don't use `with stdenv.lib` for large scopes. * sile: 0.10.4 -> 0.10.9 Add poppler_utils as check dependency. Clean up some outdated comments and hooks. Add more outputs for better closure size. * maintainers: add alerque * sile: add alerque as maintainer
This commit is contained in:
parent
e35ca5290a
commit
7e7bf5a4a1
|
@ -313,6 +313,12 @@
|
||||||
githubId = 43479487;
|
githubId = 43479487;
|
||||||
name = "Titouan Biteau";
|
name = "Titouan Biteau";
|
||||||
};
|
};
|
||||||
|
alerque = {
|
||||||
|
email = "caleb@alerque.com";
|
||||||
|
github = "alerque";
|
||||||
|
githubId = 173595;
|
||||||
|
name = "Caleb Maclennan";
|
||||||
|
};
|
||||||
alexarice = {
|
alexarice = {
|
||||||
email = "alexrice999@hotmail.co.uk";
|
email = "alexrice999@hotmail.co.uk";
|
||||||
github = "alexarice";
|
github = "alexarice";
|
||||||
|
|
|
@ -1,37 +1,78 @@
|
||||||
{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig, autoconf, automake
|
{ stdenv
|
||||||
, harfbuzz, icu
|
, darwin
|
||||||
, fontconfig, lua, libiconv
|
, fetchurl
|
||||||
, makeFontsConf, gentium
|
, makeWrapper
|
||||||
|
, pkg-config
|
||||||
|
, autoconf
|
||||||
|
, automake
|
||||||
|
, poppler_utils
|
||||||
|
, harfbuzz
|
||||||
|
, icu
|
||||||
|
, fontconfig
|
||||||
|
, lua
|
||||||
|
, libiconv
|
||||||
|
, makeFontsConf
|
||||||
|
, gentium
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with stdenv.lib;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
luaEnv = lua.withPackages(ps: with ps;[cassowary cosmo compat53 linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]);
|
luaEnv = lua.withPackages(ps: with ps; [
|
||||||
|
cassowary
|
||||||
|
cosmo
|
||||||
|
compat53
|
||||||
|
linenoise
|
||||||
|
lpeg
|
||||||
|
lua-zlib
|
||||||
|
lua_cliargs
|
||||||
|
luaepnf
|
||||||
|
luaexpat
|
||||||
|
luafilesystem
|
||||||
|
luarepl
|
||||||
|
luasec
|
||||||
|
luasocket
|
||||||
|
stdlib
|
||||||
|
vstruct
|
||||||
|
]);
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sile";
|
pname = "sile";
|
||||||
version = "0.10.4";
|
version = "0.10.9";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
|
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "08j2vv6spnzz8bsh62wbdv1pjiziiba71cadscsy5hw6pklzndni";
|
sha256 = "0r55c1nz5bkgzfviw72lyh38nls9s49zi3pja7mld6q5dclazsj4";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [ "--with-system-luarocks" ];
|
configureFlags = [
|
||||||
|
"--with-system-luarocks"
|
||||||
|
"--with-manual"
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
|
nativeBuildInputs = [
|
||||||
buildInputs = [ harfbuzz icu fontconfig libiconv luaEnv ]
|
autoconf
|
||||||
++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
|
automake
|
||||||
|
pkg-config
|
||||||
|
makeWrapper
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
harfbuzz
|
||||||
|
icu
|
||||||
|
fontconfig
|
||||||
|
libiconv
|
||||||
|
luaEnv
|
||||||
|
]
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
|
||||||
;
|
;
|
||||||
|
checkInputs = [
|
||||||
|
poppler_utils
|
||||||
|
];
|
||||||
|
|
||||||
preConfigure = optionalString stdenv.isDarwin ''
|
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m
|
sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m
|
||||||
'';
|
'';
|
||||||
|
|
||||||
NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework AppKit";
|
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework AppKit";
|
||||||
|
|
||||||
FONTCONFIG_FILE = makeFontsConf {
|
FONTCONFIG_FILE = makeFontsConf {
|
||||||
fontDirectories = [
|
fontDirectories = [
|
||||||
|
@ -39,11 +80,7 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: needs to tweak Makefile-fonts to avoid download fonts
|
doCheck = true;
|
||||||
doCheck = false; /*stdenv.targetPlatform == stdenv.hostPlatform
|
|
||||||
&& ! stdenv.isAarch64 # random seg. faults
|
|
||||||
&& ! stdenv.isDarwin; # dy lib not found
|
|
||||||
*/
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -52,18 +89,12 @@ stdenv.mkDerivation rec {
|
||||||
--replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);"
|
--replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkTarget = "examples";
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
install -D -t $out/share/doc/sile documentation/sile.pdf
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Hack to avoid TMPDIR in RPATHs.
|
# Hack to avoid TMPDIR in RPATHs.
|
||||||
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
|
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
|
||||||
|
|
||||||
outputs = [ "out" "doc" ];
|
outputs = [ "out" "doc" "man" "dev" ];
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "A typesetting system";
|
description = "A typesetting system";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
SILE is a typesetting system; its job is to produce beautiful
|
SILE is a typesetting system; its job is to produce beautiful
|
||||||
|
@ -77,6 +108,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
homepage = "https://sile-typesetter.org/";
|
homepage = "https://sile-typesetter.org/";
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
maintainers = with maintainers; [ doronbehar alerque ];
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue