diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-08-13 20:08:56 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2023-08-13 20:10:46 +0800 |
| commit | 4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18 (patch) | |
| tree | 7e76a06d9be5b7b0c509c07b435fe9397717ae69 | |
| parent | 82ac97f610f58ce58d339d90e105848494a3b1ed (diff) | |
| download | nixpkgs-4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18.tar nixpkgs-4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18.tar.gz nixpkgs-4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18.tar.bz2 nixpkgs-4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18.tar.lz nixpkgs-4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18.tar.xz nixpkgs-4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18.tar.zst nixpkgs-4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18.zip | |
pantheon.elementary-default-settings: Backport picture-uri-dark changes
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 6958547899f..e3fd576a14e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -24,6 +25,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-YFI1UM7CxjYkoIhSg9Fn81Ze6DX7D7p89xibk7ik8bI="; }; + patches = [ + # Don't set picture-uri-dark. elementary-gsettings-schemas won't + # aware of our custom remove-backgrounds.gschema.override so it + # will be a confusing invalid value otherwise (though gala actually + # can handle it well). + # https://github.com/elementary/default-settings/pull/282 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/881f84b8316e549ab627b7ac9acf352e0346a1a4.patch"; + sha256 = "sha256-zf2Anr+ljLjHbn5ZmRj3nCRVJ52rwe4EkwdIfSOGeLQ="; + }) + # https://github.com/elementary/default-settings/pull/283 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/37ef6062a8651875dd9d927c5730155c8b26e953.patch"; + sha256 = "sha256-u7rrwuHgMPn1eIyIuwJcBgy8SshaXgrgFTSNm8IHbaY="; + }) + ]; + nativeBuildInputs = [ accountsservice dbus |