From 29d9f0e624811cb3255302f773e61c36d1c8c03d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 3 Mar 2017 16:28:48 +0800 Subject: [PATCH] qsyncthingtray: fix program paths We need this for qsyncthingtray to be able to detect the processes as well. --- .../misc/qsyncthingtray/default.nix | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 0aeb7d7eb8f..4f95879d5eb 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,25 +1,44 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtwebengine -, qmakeHook }: +{ stdenv, lib, fetchFromGitHub, procps ? null +, qtbase, qtwebengine, qtwebkit +, cmake, makeQtWrapper +, syncthing, syncthing-inotify ? null +, preferQWebView ? false }: stdenv.mkDerivation rec { version = "0.5.7"; name = "qsyncthingtray-${version}"; src = fetchFromGitHub { - owner = "sieren"; - repo = "QSyncthingTray"; - rev = "${version}"; + owner = "sieren"; + repo = "QSyncthingTray"; + rev = "${version}"; sha256 = "0crrdpdmlc4ahkvp5znzc4zhfwsdih655q1kfjf0g231mmynxhvq"; }; - buildInputs = [ qtbase qtwebengine ]; - nativeBuildInputs = [ qmakeHook ]; + buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; + nativeBuildInputs = [ cmake makeQtWrapper ]; enableParallelBuilding = true; - postInstall = '' + cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"; + + postPatch = '' + ${lib.optionalString stdenv.isLinux '' + substituteInPlace includes/platforms/linux/posixUtils.hpp \ + --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \ + --replace '"/usr/local/bin/syncthing-inotify"' '"${syncthing-inotify}/bin/syncthing-inotify"' \ + --replace '"pgrep -x' '"${procps}/bin/pgrep -x' + ''} + + ${lib.optionalString stdenv.isDarwin '' + substituteInPlace includes/platforms/darwin/macUtils.hpp \ + --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' + ''} + ''; + + installPhase = let qst = "qsyncthingtray"; in '' mkdir -p $out/bin - cp binary/QSyncthingTray $out/bin + install -m755 QSyncthingTray $out/bin/${qst} + ln -s $out/bin/${qst} $out/bin/QSyncthingTray ''; meta = with stdenv.lib; { @@ -31,7 +50,7 @@ stdenv.mkDerivation rec { Written in C++ with Qt. ''; license = licenses.lgpl3; - maintainers = with maintainers; [ zraexy ]; + maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; };