MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 08:36:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

harfbuzz: add harfbuzzFull and remove other variants

Browse source
This commit is contained in:
Daiderd Jordan 2018-05-27 14:25:55 +02:00
parent 10267bfc90
commit 80aca28e34
No known key found for this signature in database
GPG key ID: D02435D05B810C96
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -82,8 +82,8 @@ let
xdg_utils yasm minizip libwebp
libusb1 re2 zlib
ffmpeg libxslt libxml2
# harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
];
# build paths and release info

4
pkgs/tools/typesetting/tectonic/default.nix
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

23
pkgs/top-level/all-packages.nix
View file

@ -9770,13 +9770,12 @@ with pkgs;
harfbuzz = callPackage ../development/libraries/harfbuzz {
inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText;
};
harfbuzz-icu = harfbuzz.override {
harfbuzzFull = harfbuzz.override {
withCoreText = stdenv.isDarwin;
withGraphite2 = true;
withIcu = true;
};
harfbuzz-icu-58 = harfbuzz-icu.override {
icu = icu58;
};
hawknl = callPackage ../development/libraries/hawknl { };
@ -11574,7 +11573,7 @@ with pkgs;
inherit stdenv fetchurl makeSetupHook;
bison = bison2; # error: too few arguments to function 'int yylex(...
inherit cups;
harfbuzz = harfbuzz-icu;
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
inherit (gst_all_1) gstreamer gst-plugins-base;
@ -11588,7 +11587,7 @@ with pkgs;
inherit stdenv fetchurl makeSetupHook;
bison = bison2; # error: too few arguments to function 'int yylex(...
inherit cups;
harfbuzz = harfbuzz-icu;
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
inherit (gst_all_1) gstreamer gst-plugins-base;
@ -11603,7 +11602,7 @@ with pkgs;
inherit stdenv fetchurl fetchFromGitHub makeSetupHook;
bison = bison2; # error: too few arguments to function 'int yylex(...
inherit cups;
harfbuzz = harfbuzz-icu;
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
inherit (gst_all_1) gstreamer gst-plugins-base;
@ -12123,7 +12122,9 @@ with pkgs;
tecla = callPackage ../development/libraries/tecla { };
tectonic = callPackage ../tools/typesetting/tectonic { };
tectonic = callPackage ../tools/typesetting/tectonic {
harfbuzz = harfbuzzFull;
};
tepl = callPackage ../development/libraries/tepl { };
@ -12318,13 +12319,15 @@ with pkgs;
webkitgtk = webkitgtk220x;
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzz-icu-58;
harfbuzz = harfbuzzFull.override {
icu = icu58;
};
gst-plugins-base = gst_all_1.gst-plugins-base;
inherit (darwin) libobjc;
};
webkitgtk220x = callPackage ../development/libraries/webkitgtk/2.20.nix {
harfbuzz = harfbuzz-icu;
harfbuzz = harfbuzzFull;
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
stdenv = overrideCC stdenv gcc6;
};