Unverified Commit 1ae92677 authored by Stephen Huan's avatar Stephen Huan
Browse files

backintime: 1.3.3 -> 1.4.3

parent d8fe5e6c

pkgs/applications/networking/sync/backintime/common.nix

+4 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ let 
  apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ];

in stdenv.mkDerivation rec {

  pname = "backintime-common";

  version = "1.3.3";

  version = "1.4.3";



  src = fetchFromGitHub {

    owner = "bit-team";

    repo = "backintime";

    rev = "v${version}";

    sha256 = "sha256-cKmzq155/dCl5wZA2SE3XjfCocHxTh4Wa2IdfzSfQHg=";

    sha256 = "sha256-2q2Q4rnxXwVnfH1YEBwY35B2ctG9+qpOIAHqPOjjArg=";

  };



  nativeBuildInputs = [ makeWrapper gettext ];
@@ -21,6 +21,8 @@ in stdenv.mkDerivation rec { 


  installFlags = [ "DEST=$(out)" ];



  configureFlags = [ "--python=${lib.getExe python'}" ];



  preConfigure = ''

    cd common

    substituteInPlace configure \

pkgs/applications/networking/sync/backintime/qt.nix

+3 −4
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ mkDerivation { 


  buildInputs = [ python' backintime-common ];



  configureFlags = [ "--python=${lib.getExe python'}" ];



  preConfigure = ''

    cd qt

    substituteInPlace configure \

      --replace '"/../etc' '"/etc'

    substituteInPlace qttools.py \

    substituteInPlace qttools_path.py \

      --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"'

  '';
@@ -37,7 +37,6 @@ mkDerivation { 
      --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice"



    substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \

      --replace "/usr/bin/python3" "${lib.getBin python'}/bin/python3" \

      --replace "/usr/share/backintime" "$out/share/backintime"



    substituteInPlace "$out/bin/backintime-qt_polkit" \