Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1f7b8c71a9fb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f96a9fbce06
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 7, 2019

  1. sile: build and install documentation (self test) 

    - added primary fonts (some non free fonts are missing, but sile selects
  alternative fonts) used by documentation
    @ck3d
    ck3d committed Mar 7, 2019
    Copy the full SHA
    b084085 View commit details

  2. Merge pull request #56873 from ck3d/sile-doc 

    sile: build and install documentation (self test)
    @markuskowa
    markuskowa authored Mar 7, 2019
    Copy the full SHA
    7f96a9f View commit details
Showing with 23 additions and 0 deletions.
  1. +23 −0 pkgs/tools/typesetting/sile/default.nix
23 changes: 23 additions & 0 deletions pkgs/tools/typesetting/sile/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig
, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem, luasocket, luasec
, fontconfig, lua, libiconv
, makeFontsConf, gentium, gentium-book-basic, dejavu_fonts
}:

with stdenv.lib;
@@ -40,15 +41,37 @@ stdenv.mkDerivation rec {
LUA_PATH = luaPath;
LUA_CPATH = luaCPath;

FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [
gentium
gentium-book-basic
dejavu_fonts
];
};

doCheck = stdenv.targetPlatform == stdenv.hostPlatform
&& ! stdenv.isAarch64 # random seg. faults
&& ! stdenv.isDarwin; # dy lib not found

enableParallelBuilding = true;

checkPhase = ''
make documentation/developers.pdf documentation/sile.pdf
'';

postInstall = ''
wrapProgram $out/bin/sile \
--set LUA_PATH "${luaPath};" \
--set LUA_CPATH "${luaCPath};" \
install -D -t $out/share/doc/sile documentation/*.pdf
'';

# Hack to avoid TMPDIR in RPATHs.
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';

outputs = [ "out" "doc" ];

meta = {
description = "A typesetting system";
longDescription = ''