qsyncthingtray: allow building with qt 5.8

NixOS · Apr 27, 2017 · e89343d · e89343d · zraexy · May 12, 2017
1 parent d3bf2af
commit e89343d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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 { };