backintime-qt: 1.1.24 -> 1.2.1

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>

authored by

freezeboy
Dmitry Kalinkin
and committed by
Dmitry Kalinkin
00e30c9e 63bc9d32

+28 -30
+26
pkgs/applications/networking/sync/backintime/qt.nix
··· 1 + { mkDerivation, backintime-common, python3 }: 2 + 3 + let 4 + python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common ]); 5 + in 6 + mkDerivation { 7 + inherit (backintime-common) 8 + version src installFlags meta dontAddPrefix nativeBuildInputs; 9 + 10 + pname = "backintime-qt"; 11 + 12 + buildInputs = [ python' backintime-common ]; 13 + 14 + preConfigure = '' 15 + cd qt 16 + substituteInPlace configure \ 17 + --replace '"/../etc' '"/etc' 18 + substituteInPlace qttools.py \ 19 + --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' 20 + ''; 21 + 22 + preFixup = '' 23 + wrapQtApp "$out/bin/backintime-qt" \ 24 + --prefix PATH : "${backintime-common}/bin:$PATH" 25 + ''; 26 + }
-28
pkgs/applications/networking/sync/backintime/qt4.nix
··· 1 - {stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }: 2 - 3 - stdenv.mkDerivation { 4 - inherit (backintime-common) version src installFlags; 5 - 6 - pname = "backintime-qt4"; 7 - 8 - buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ]; 9 - 10 - preConfigure = "cd qt4"; 11 - configureFlags = [ ]; 12 - 13 - dontAddPrefix = true; 14 - 15 - preFixup = 16 - '' 17 - substituteInPlace "$out/bin/backintime-qt4" \ 18 - --replace "=\"/usr/share" "=\"$prefix/share" 19 - 20 - wrapProgram "$out/bin/backintime-qt4" \ 21 - --prefix PYTHONPATH : "${backintime-common}/share/backintime/common:$PYTHONPATH" \ 22 - --prefix PATH : "${backintime-common}/bin:$PATH" 23 - ''; 24 - 25 - meta = with stdenv.lib; { 26 - broken = true; 27 - }; 28 - }
+2 -2
pkgs/top-level/all-packages.nix
··· 20007 20007 20008 20008 backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; 20009 20009 20010 - backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; 20010 + backintime-qt = libsForQt5.callPackage ../applications/networking/sync/backintime/qt.nix { }; 20011 20011 20012 - backintime = backintime-qt4; 20012 + backintime = backintime-qt; 20013 20013 20014 20014 balsa = callPackage ../applications/networking/mailreaders/balsa { }; 20015 20015