Unverified Commit fc48aead authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

Merge pull request #255466 from uninsane/pr-font-manager-webkit-opt

font-manager: allow building without webkit
parents 1a6da131 54931faf
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -18,9 +18,8 @@
, desktop-file-utils
, wrapGAppsHook
, gobject-introspection
, libsoup
, glib-networking
, webkitgtk
# withWebkit enables the "webkit" feature, also known as Google Fonts
, withWebkit ? true, glib-networking, libsoup, webkitgtk
}:

stdenv.mkDerivation rec {
@@ -29,9 +28,9 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "FontManager";
    repo = "master";
    repo = "font-manager";
    rev = version;
    sha256 = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo=";
    hash = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo=";
  };

  nativeBuildInputs = [
@@ -56,13 +55,15 @@ stdenv.mkDerivation rec {
    gsettings-desktop-schemas # for font settings
    gtk3
    gnome.adwaita-icon-theme
    libsoup
  ] ++ lib.optionals withWebkit [
    glib-networking # for SSL so that Google Fonts can load
    libsoup
    webkitgtk
  ];

  mesonFlags = [
    "-Dreproducible=true" # Do not hardcode build directory…
    (lib.mesonBool "webkit" withWebkit)
  ];

  postPatch = ''