From f25c11670721aad8d2e71aa42ffae3ce6e35609e Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 7 Dec 2024 17:16:34 +0800 Subject: [PATCH] timeshift: sort dependencies alphabetically --- .../applications/backup/timeshift/default.nix | 30 +++++++++---------- .../applications/backup/timeshift/wrapper.nix | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 9f550af44881..9c6de88703b3 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -1,28 +1,28 @@ { callPackage, - timeshift-unwrapped, - rsync, - coreutils, - mount, - umount, - psmisc, - cron, btrfs-progs, + coreutils, + cron, grubPackage, + mount, + psmisc, + rsync, + timeshift-unwrapped, + umount, }: let timeshift-wrapper = callPackage ./wrapper.nix { }; in -(timeshift-wrapper timeshift-unwrapped ([ - rsync - coreutils - mount - umount - psmisc - cron +(timeshift-wrapper timeshift-unwrapped [ btrfs-progs + coreutils + cron grubPackage -])).overrideAttrs + mount + psmisc + rsync + umount +]).overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { description = oldAttrs.meta.description; diff --git a/pkgs/applications/backup/timeshift/wrapper.nix b/pkgs/applications/backup/timeshift/wrapper.nix index 0769ee957642..5bbfffb94d46 100644 --- a/pkgs/applications/backup/timeshift/wrapper.nix +++ b/pkgs/applications/backup/timeshift/wrapper.nix @@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation { dontUnpack = true; nativeBuildInputs = [ - xorg.lndir wrapGAppsHook3 + xorg.lndir ]; installPhase = ''