public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-08-25 07:37:14 +02:00
parent f4745bef6c 7f8b1dd32f
commit 8fbe3a484a
165 changed files with 4542 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/typesetting/tectonic/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, rustPlatform
, darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }:
, darwin, fontconfig, harfbuzz, openssl, pkgconfig }:
rustPlatform.buildRustPackage rec {
name = "tectonic-${version}";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fontconfig harfbuzz-icu openssl ]
buildInputs = [ fontconfig harfbuzz openssl ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
# tests fail due to read-only nix store