Merge pull request #250088 from bobby285271/upd/pantheon
pantheon.elementary-default-settings: 7.0.2 -> 7.1.0
This commit is contained in:
commit
be9afcd6ef
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
|
@ -11,37 +10,19 @@
|
|||
, dbus
|
||||
, polkit
|
||||
, accountsservice
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-default-settings";
|
||||
version = "7.0.2";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "default-settings";
|
||||
rev = version;
|
||||
sha256 = "sha256-YFI1UM7CxjYkoIhSg9Fn81Ze6DX7D7p89xibk7ik8bI=";
|
||||
sha256 = "sha256-j4K8qYwfu6/s4qnTSzwv6KRsk9f+Qr/l1bhLywKMHMU=";
|
||||
};
|
||||
|
||||
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
|
||||
|
@ -50,7 +31,6 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
polkit
|
||||
python3
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -59,11 +39,6 @@ stdenv.mkDerivation rec {
|
|||
"-Dplank-dockitems=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# Install our override for plank dockitems as the desktop file path is different.
|
||||
schema_dir=$out/share/glib-2.0/schemas
|
||||
|
|
Loading…
Reference in a new issue