backintime-common: 1.1.24 -> 1.2.1

authored by

freezeboy and committed by
Dmitry Kalinkin
63bc9d32 610f92f2

+19 -13
+19 -13
pkgs/applications/networking/sync/backintime/common.nix
··· 1 - {stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfs-fuse, encfs }: 1 + {stdenv, lib, fetchFromGitHub, makeWrapper, gettext, 2 + python3, rsync, cron, openssh, sshfs-fuse, encfs }: 2 3 3 4 let 4 - inherit (python3Packages) python dbus-python keyring; 5 - in stdenv.mkDerivation rec { 6 - version = "1.1.24"; 5 + python' = python3.withPackages (ps: with ps; [ dbus-python keyring ]); 7 6 7 + apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; 8 + in stdenv.mkDerivation rec { 8 9 pname = "backintime-common"; 10 + version = "1.2.1"; 9 11 10 12 src = fetchFromGitHub { 11 13 owner = "bit-team"; 12 14 repo = "backintime"; 13 15 rev = "v${version}"; 14 - sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18"; 16 + sha256 = "mBjheLY7DHs995heZmxVnDdvABkAROCjRJ4a/uJmJcg="; 15 17 }; 16 18 17 - buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ]; 19 + nativeBuildInputs = [ makeWrapper gettext ]; 20 + buildInputs = [ python' ]; 18 21 19 22 installFlags = [ "DEST=$(out)" ]; 20 23 21 - preConfigure = "cd common"; 24 + preConfigure = '' 25 + cd common 26 + substituteInPlace configure \ 27 + --replace "/.." "" \ 28 + --replace "share/backintime" "${python'.sitePackages}/backintime" 29 + substituteInPlace "backintime" \ 30 + --replace "share" "${python'.sitePackages}" 31 + ''; 22 32 23 33 dontAddPrefix = true; 24 34 25 - preFixup = 26 - '' 27 - substituteInPlace "$out/bin/backintime" \ 28 - --replace "=\"/usr/share" "=\"$prefix/share" 35 + preFixup = '' 29 36 wrapProgram "$out/bin/backintime" \ 30 - --prefix PYTHONPATH : "$PYTHONPATH" \ 31 - --prefix PATH : "$prefix/bin:$PATH" 37 + --prefix PATH : ${apps} 32 38 ''; 33 39 34 40 meta = {