diff options
Diffstat (limited to 'pkgs/applications/backup/deja-dup/default.nix')
-rw-r--r-- | pkgs/applications/backup/deja-dup/default.nix | 53 |
1 files changed, 9 insertions, 44 deletions
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index d283dc7107d74..5d1d75e31ebcf 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -3,44 +3,32 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , vala , gettext -, gnome3 -, libnotify , itstool , glib , gtk3 -, libxml2 -, gnome-online-accounts , coreutils , libsoup , libsecret -, pcre -, libxkbcommon +, libhandy , wrapGAppsHook -, libpthreadstubs -, libXdmcp -, epoxy -, at-spi2-core -, dbus , libgpgerror , json-glib -, appstream-glib -, desktop-file-utils , duplicity }: stdenv.mkDerivation rec { pname = "deja-dup"; - version = "40.6"; + version = "42.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "1d4g34g660wv42a4k2511bxrh90z0vdl3v7ahg0m45phijg9n2n1"; + sha256 = "c4E6mHYVb8TWVTVlmHidcLa9ebHJ27iStsNNLJhY8vY="; }; patches = [ @@ -48,54 +36,31 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit coreutils; }) - - # Hardcode GSettings path for Nautilus extension to avoid crashes from missing schemas - ./hardcode-gsettings.patch ]; - postPatch = '' - # substitute variable from hardcode-gsettings.patch - substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH "${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" - ''; - nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gettext itstool - appstream-glib - desktop-file-utils - libxml2 wrapGAppsHook ]; buildInputs = [ - libnotify libsoup glib gtk3 libsecret - pcre - libxkbcommon - libpthreadstubs - libXdmcp - epoxy - gnome3.nautilus - at-spi2-core - dbus - gnome-online-accounts # GOA not used any more, only for transferring legacy keys + libhandy libgpgerror json-glib ]; - # TODO: hard code the path - # https://gitlab.gnome.org/World/deja-dup/merge_requests/32 - propagatedUserEnvPkgs = [ duplicity ]; - - # install nautilus plug-in to correct path - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + mesonFlags = [ + "-Dduplicity_command=${duplicity}/bin/duplicity" + ]; meta = with stdenv.lib; { description = "A simple backup tool"; |