diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-04 09:28:07 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-04 09:28:07 +0100 |
commit | 10c57af49c077493988b5bf123cb3f611e02322d (patch) | |
tree | 35c30f913782cd4131df023299e57c7deca8d921 /pkgs/applications/networking/sync | |
parent | 4148fc489b29e826bd42ed05e12ba6fe64c2921e (diff) | |
parent | 9e6d7d3c744a5cbaba603b14cd0676c132e2d499 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking/sync')
-rw-r--r-- | pkgs/applications/networking/sync/backintime/common.nix | 32 | ||||
-rw-r--r-- | pkgs/applications/networking/sync/backintime/qt.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/networking/sync/backintime/qt4.nix | 28 |
3 files changed, 45 insertions, 41 deletions
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 6244cd661d0ad..73b40ea111a78 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -1,34 +1,40 @@ -{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfs-fuse, encfs }: +{stdenv, lib, fetchFromGitHub, makeWrapper, gettext, +python3, rsync, cron, openssh, sshfs-fuse, encfs }: let - inherit (python3Packages) python dbus-python keyring; -in stdenv.mkDerivation rec { - version = "1.1.24"; + python' = python3.withPackages (ps: with ps; [ dbus-python keyring ]); + apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; +in stdenv.mkDerivation rec { pname = "backintime-common"; + version = "1.2.1"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18"; + sha256 = "mBjheLY7DHs995heZmxVnDdvABkAROCjRJ4a/uJmJcg="; }; - buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ]; + nativeBuildInputs = [ makeWrapper gettext ]; + buildInputs = [ python' ]; installFlags = [ "DEST=$(out)" ]; - preConfigure = "cd common"; + preConfigure = '' + cd common + substituteInPlace configure \ + --replace "/.." "" \ + --replace "share/backintime" "${python'.sitePackages}/backintime" + substituteInPlace "backintime" \ + --replace "share" "${python'.sitePackages}" + ''; dontAddPrefix = true; - preFixup = - '' - substituteInPlace "$out/bin/backintime" \ - --replace "=\"/usr/share" "=\"$prefix/share" + preFixup = '' wrapProgram "$out/bin/backintime" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PATH : "$prefix/bin:$PATH" + --prefix PATH : ${apps} ''; meta = { diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix new file mode 100644 index 0000000000000..a48d6d8804fe0 --- /dev/null +++ b/pkgs/applications/networking/sync/backintime/qt.nix @@ -0,0 +1,26 @@ +{ mkDerivation, backintime-common, python3 }: + +let + python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common ]); +in +mkDerivation { + inherit (backintime-common) + version src installFlags meta dontAddPrefix nativeBuildInputs; + + pname = "backintime-qt"; + + buildInputs = [ python' backintime-common ]; + + preConfigure = '' + cd qt + substituteInPlace configure \ + --replace '"/../etc' '"/etc' + substituteInPlace qttools.py \ + --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' + ''; + + preFixup = '' + wrapQtApp "$out/bin/backintime-qt" \ + --prefix PATH : "${backintime-common}/bin:$PATH" + ''; +} diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix deleted file mode 100644 index b72ddc8bae63b..0000000000000 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }: - -stdenv.mkDerivation { - inherit (backintime-common) version src installFlags; - - pname = "backintime-qt4"; - - buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ]; - - preConfigure = "cd qt4"; - configureFlags = [ ]; - - dontAddPrefix = true; - - preFixup = - '' - substituteInPlace "$out/bin/backintime-qt4" \ - --replace "=\"/usr/share" "=\"$prefix/share" - - wrapProgram "$out/bin/backintime-qt4" \ - --prefix PYTHONPATH : "${backintime-common}/share/backintime/common:$PYTHONPATH" \ - --prefix PATH : "${backintime-common}/bin:$PATH" - ''; - - meta = with stdenv.lib; { - broken = true; - }; -} |