diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 08:46:06 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 10:32:23 +0100 |
commit | dd556b02baf86e80f1c0a18fbd41366814d82ec3 (patch) | |
tree | 505a50280c4e44de045a075184733bfb35def813 /pkgs/applications/backup/deja-dup/default.nix | |
parent | b7dd2ef91dba38a6c8741c0ef04f0809be94f91a (diff) |
deja-dup: clean up
Diffstat (limited to 'pkgs/applications/backup/deja-dup/default.nix')
-rw-r--r-- | pkgs/applications/backup/deja-dup/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index b0d8ae8d3cf66..1ea4b4d275064 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext -, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 +{ stdenv, fetchurl, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext +, gnome3, libnotify, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror , appstream-glib, desktop-file-utils, duplicity @@ -15,20 +15,14 @@ stdenv.mkDerivation rec { }; patches = [ - ./fix-paths.patch + (substituteAll { + src = ./fix-paths.patch; + inherit coreutils; + }) ]; - postPatch = '' - substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \ - "/bin/rm" \ - "${coreutils}/bin/rm" - ''; - - # couldn't find gio/gdesktopappinfo.h - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ - meson ninja pkgconfig vala_0_38 gettext intltool itstool + meson ninja pkgconfig vala_0_40 gettext itstool appstream-glib desktop-file-utils libxml2 wrapGAppsHook ]; @@ -40,6 +34,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ duplicity ]; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; |