diff options
| -rw-r--r-- | pkgs/applications/misc/qsyncthingtray/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 4f95879d5eb..c314a226b26 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -36,9 +36,14 @@ stdenv.mkDerivation rec { ''; installPhase = let qst = "qsyncthingtray"; in '' + runHook preInstall + mkdir -p $out/bin install -m755 QSyncthingTray $out/bin/${qst} ln -s $out/bin/${qst} $out/bin/QSyncthingTray + wrapQtProgram $out/bin/qsyncthingtray + + runHook postInstall ''; meta = with stdenv.lib; { @@ -52,6 +57,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; - broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; + # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK + broken = builtins.compareVersions qtbase.version "5.7.0" == 0; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f7d6ea92b5..3be611430f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15251,8 +15251,8 @@ with pkgs; qt = qt4; }; - # 0.5.7 segfaults when opening the main panel with qt 5.7 - qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { }; + # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK + qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; qsynth = callPackage ../applications/audio/qsynth { }; |