Skip to content

Commit

Permalink
deja-dup: 40.6 → 42.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jtojnar committed Sep 12, 2020
1 parent 6152513 commit b31de37
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 60 deletions.
53 changes: 9 additions & 44 deletions pkgs/applications/backup/deja-dup/default.nix
Expand Up @@ -3,99 +3,64 @@
, 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 = [
(substituteAll {
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";
Expand Down
16 changes: 0 additions & 16 deletions pkgs/applications/backup/deja-dup/hardcode-gsettings.patch

This file was deleted.

0 comments on commit b31de37

Please sign in to comment.