diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 53bcc5a373bf..9f550af44881 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -1,13 +1,14 @@ -{ callPackage -, timeshift-unwrapped -, rsync -, coreutils -, mount -, umount -, psmisc -, cron -, btrfs-progs -, grubPackage +{ + callPackage, + timeshift-unwrapped, + rsync, + coreutils, + mount, + umount, + psmisc, + cron, + btrfs-progs, + grubPackage, }: let timeshift-wrapper = callPackage ./wrapper.nix { }; @@ -21,12 +22,15 @@ in cron btrfs-progs grubPackage -])).overrideAttrs (oldAttrs: { - meta = oldAttrs.meta // { - description = oldAttrs.meta.description; - longDescription = oldAttrs.meta.longDescription + '' - This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs. - If you want to use the commands provided by the system, use timeshift-minimal instead. - ''; - }; -}) +])).overrideAttrs + (oldAttrs: { + meta = oldAttrs.meta // { + description = oldAttrs.meta.description; + longDescription = + oldAttrs.meta.longDescription + + '' + This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs. + If you want to use the commands provided by the system, use timeshift-minimal instead. + ''; + }; + }) diff --git a/pkgs/applications/backup/timeshift/minimal.nix b/pkgs/applications/backup/timeshift/minimal.nix index 96946fa72e05..113200c30e73 100644 --- a/pkgs/applications/backup/timeshift/minimal.nix +++ b/pkgs/applications/backup/timeshift/minimal.nix @@ -1,5 +1,6 @@ -{ callPackage -, timeshift-unwrapped +{ + callPackage, + timeshift-unwrapped, }: let timeshift-wrapper = callPackage ./wrapper.nix { }; @@ -7,9 +8,11 @@ in (timeshift-wrapper timeshift-unwrapped [ ]).overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { description = oldAttrs.meta.description + " (without runtime dependencies)"; - longDescription = oldAttrs.meta.longDescription + '' - This package is a wrapped version of timeshift-unwrapped - without runtime dependencies of command utilities. - ''; + longDescription = + oldAttrs.meta.longDescription + + '' + This package is a wrapped version of timeshift-unwrapped + without runtime dependencies of command utilities. + ''; }; }) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 86d6794051ef..3fbaed4b21be 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchFromGitHub -, gettext -, help2man -, meson -, ninja -, pkg-config -, vala -, gtk3 -, json-glib -, libgee -, util-linux -, vte -, xapp +{ + lib, + stdenv, + fetchFromGitHub, + gettext, + help2man, + meson, + ninja, + pkg-config, + vala, + gtk3, + json-glib, + libgee, + util-linux, + vte, + xapp, }: stdenv.mkDerivation rec { @@ -65,6 +66,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/timeshift"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ShamrockLee bobby285271 ]; + maintainers = with maintainers; [ + ShamrockLee + bobby285271 + ]; }; } diff --git a/pkgs/applications/backup/timeshift/wrapper.nix b/pkgs/applications/backup/timeshift/wrapper.nix index 84b3f14ac2ff..0769ee957642 100644 --- a/pkgs/applications/backup/timeshift/wrapper.nix +++ b/pkgs/applications/backup/timeshift/wrapper.nix @@ -1,14 +1,14 @@ -{ stdenvNoCC -, lib -, wrapGAppsHook3 -, gdk-pixbuf -, librsvg -, xorg -, shared-mime-info +{ + stdenvNoCC, + lib, + wrapGAppsHook3, + gdk-pixbuf, + librsvg, + xorg, + shared-mime-info, }: -timeshift-unwrapped: -runtimeDeps: +timeshift-unwrapped: runtimeDeps: stdenvNoCC.mkDerivation { inherit (timeshift-unwrapped) pname version; @@ -34,7 +34,13 @@ stdenvNoCC.mkDerivation { ) gappsWrapperArgs+=( # Thumbnailers - --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ gdk-pixbuf librsvg shared-mime-info ]}" + --prefix XDG_DATA_DIRS : "${ + lib.makeSearchPath "share" [ + gdk-pixbuf + librsvg + shared-mime-info + ] + }" "''${makeWrapperArgs[@]}" ) wrapProgram "$out/bin/timeshift" "''${makeWrapperArgs[@]}"