From 00e30c9e9e382fb40fc6dd817571d379af01fefc Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 03:04:29 +0100 Subject: [PATCH] backintime-qt: 1.1.24 -> 1.2.1 Co-authored-by: Dmitry Kalinkin --- .../networking/sync/backintime/qt.nix | 26 +++++++++++++++++ .../networking/sync/backintime/qt4.nix | 28 ------------------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 pkgs/applications/networking/sync/backintime/qt.nix delete mode 100644 pkgs/applications/networking/sync/backintime/qt4.nix diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix new file mode 100644 index 000000000000..a48d6d8804fe --- /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 b72ddc8bae63..000000000000 --- 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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f66f57699132..870919b93802 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20007,9 +20007,9 @@ in backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; - backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; + backintime-qt = libsForQt5.callPackage ../applications/networking/sync/backintime/qt.nix { }; - backintime = backintime-qt4; + backintime = backintime-qt; balsa = callPackage ../applications/networking/mailreaders/balsa { };