backintime: 1.3.3 -> 1.4.3

+7 -6
+4 -2
pkgs/applications/networking/sync/backintime/common.nix
··· 7 7 apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; 8 8 in stdenv.mkDerivation rec { 9 9 pname = "backintime-common"; 10 - version = "1.3.3"; 10 + version = "1.4.3"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "bit-team"; 14 14 repo = "backintime"; 15 15 rev = "v${version}"; 16 - sha256 = "sha256-cKmzq155/dCl5wZA2SE3XjfCocHxTh4Wa2IdfzSfQHg="; 16 + sha256 = "sha256-2q2Q4rnxXwVnfH1YEBwY35B2ctG9+qpOIAHqPOjjArg="; 17 17 }; 18 18 19 19 nativeBuildInputs = [ makeWrapper gettext ]; 20 20 buildInputs = [ python' ]; 21 21 22 22 installFlags = [ "DEST=$(out)" ]; 23 + 24 + configureFlags = [ "--python=${lib.getExe python'}" ]; 23 25 24 26 preConfigure = '' 25 27 cd common
+3 -4
pkgs/applications/networking/sync/backintime/qt.nix
··· 11 11 12 12 buildInputs = [ python' backintime-common ]; 13 13 14 + configureFlags = [ "--python=${lib.getExe python'}" ]; 15 + 14 16 preConfigure = '' 15 17 cd qt 16 - substituteInPlace configure \ 17 - --replace '"/../etc' '"/etc' 18 - substituteInPlace qttools.py \ 18 + substituteInPlace qttools_path.py \ 19 19 --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' 20 20 ''; 21 21 ··· 37 37 --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" 38 38 39 39 substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ 40 - --replace "/usr/bin/python3" "${lib.getBin python'}/bin/python3" \ 41 40 --replace "/usr/share/backintime" "$out/share/backintime" 42 41 43 42 substituteInPlace "$out/bin/backintime-qt_polkit" \