colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qsyncthingtray: allow building with qt 5.8

Browse Source
This commit is contained in:
Peter Hoeg 2017-04-27 12:06:26 +08:00
parent d3bf2afc54
commit e89343dc08
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/qsyncthingtray/default.nix
View File

@ -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;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };