From 1c64941016edfa2d28a637cb2333cd84ef908007 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 28 Oct 2021 14:29:18 +0800 Subject: [PATCH] pantheon.elementary-default-settings: fix gtk-theme-name and gtk-font-name --- .../elementary-default-settings/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 1751636da008..f302fd994025 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -26,11 +28,14 @@ stdenv.mkDerivation rec { sha256 = "0gqnrm968j4v699yhhiyw5fqjy4zbvvrjci2v1jrlycn09c2yrwf"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + # Update gtk-theme-name and gtk-font-name for Pantheon 6 + # https://github.com/elementary/default-settings/pull/252 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/be24c151492bb9115c75bd1a7abc88714240294a.patch"; + sha256 = "sha256-EglFiN4CLbL8osfNGLvjD220Al35uBXuRNC9Ud3QYBI="; + }) + ]; nativeBuildInputs = [ accountsservice @@ -80,6 +85,12 @@ stdenv.mkDerivation rec { rm -rf $out/share/applications ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Default settings and configuration files for elementary"; homepage = "https://github.com/elementary/default-settings";